[FIX] Image build checks missing setuptools

Use pip3 in event system has both pip2 and pip3 installed. 
Use apt to install setuptools for Ansible's consumption.

Change-Id: I6929ecb0cce2ec8ac70e9261acb9f87dc7031153
Co-authored-by: Alexander Hughes <Alexander.Hughes@pm.me>
This commit is contained in:
DODDA, PRATEEK 2020-06-26 13:27:03 -05:00 committed by Prateek Dodda
parent a2606e75b1
commit b0ec40f033
9 changed files with 26 additions and 7 deletions

View File

@ -65,8 +65,8 @@ tests:
response_headers:
content-type: /^application\/octet-stream|^application\/octet-stream;\ charset=UTF-8/
response_strings:
# base64.b64encode(repr("not-a-real-password"))
- J25vdC1hLXJlYWwtcGFzc3dvcmQn
# base64.encode_as_text(repr("not-a-real-password"))
- !!binary SjI1dmRDMWhMWEpsWVd3dGNHRnpjM2R2Y21Rbg==
- name: verify_revision_documents_returns_secret_ref
desc: Verify that the documents for the created revision returns the secret ref.

View File

@ -62,8 +62,8 @@ tests:
response_headers:
content-type: /^application\/octet-stream$|^application\/octet-stream;\ charset=UTF-8$/
response_strings:
# base64.b64encode(repr("not-a-real-password"))
- J25vdC1hLXJlYWwtcGFzc3dvcmQn
# base64.encode_as_text(repr("not-a-real-password"))
- !!binary SjI1dmRDMWhMWEpsWVd3dGNHRnpjM2R2Y21Rbg==
- name: delete_all_revisions
desc: Delete all revisions from Deckhand, which should delete all secrets.

View File

@ -15,4 +15,5 @@ bandit==1.5.1
gabbi==1.35.1
pifpaf==2.1.2
oslotest==3.7.0
yq>=2.7.2
yq>=2.7.2
tox

View File

@ -22,7 +22,16 @@
daemon_reload: yes
name: systemd-resolved
become: yes
- name: ensure pip is installed
apt:
name: "{{ item }}"
with_items:
- python-pip
- python3-pip
- python-setuptools
- python3-setuptools
when: ansible_os_family == 'Debian'
become: true
- name: Clone Required Repositories
shell: |
export CLONE_DECKHAND={{ CLONE_DECKHAND }}

View File

@ -47,10 +47,14 @@
with_items:
- docker.io
- python-pip
- python3-pip
- python-setuptools
- python3-setuptools
when: ansible_os_family == 'Debian'
- pip:
name: docker
version: 2.7.0
executable: pip
become: True
- name: Make images

View File

@ -33,11 +33,13 @@
become: yes
roles:
- setup-firewall
- install-test-requirements
- deploy-python-pip
- deploy-docker
- deploy-jq
tags:
- setup-firewall
- install-test-requirements
- deploy-python-pip
- deploy-docker
- deploy-jq

View File

@ -17,6 +17,7 @@
roles:
- disable-systemd-resolved
- install-postgresql
- install-test-requirements
- run-functional-tests
tags:
- install-postgresql

View File

@ -17,6 +17,7 @@
roles:
- disable-systemd-resolved
- install-postgresql
- install-test-requirements
- run-integration-tests
tags:
- install-postgresql

View File

@ -20,7 +20,8 @@
- name: Install pip3 and gabbi
shell: |
set -xe;
apt-get install -y python-pip
apt-get install -y python-pip python3-pip \
python-setuptools python3-setuptools
pip install --upgrade pip
pip install -r test-requirements.txt
args: