fix pip vendor retry failure in lxd container

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
charmed-kubernetes · Nov 2, 2020 · 6026115 · 6026115
1 parent 9e2c1f7
commit 6026115
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/jobs/build-debs/debuilder-playbook.yml b/jobs/build-debs/debuilder-playbook.yml
@@ -27,7 +27,7 @@
           tox
     - name: upgrade system pip
       shell: |
-        pip3 install pip --upgrade
+        pip3 install pip tox --upgrade
     - name: copy ssh creds
       copy:
         src: "{{ lookup('env', 'CDKBOTSSHCREDS') }}"

diff --git a/jobs/build-debs/run.sh.j2 b/jobs/build-debs/run.sh.j2
@@ -3,11 +3,7 @@
 set -x
 
 export GIT_SSH_COMMAND='ssh -i /root/.ssh/cdkbot_rsa -oStrictHostKeyChecking=no'
-export CDKBOT_GH_USR="{{ lookup('env', 'CDKBOT_GH_USER') }}"
-export CDKBOT_GH_PSW="{{ lookup('env', 'CDKBOT_GH_PSW') }}"
 export DEBEMAIL="Kubernetes Engineering <k8s-team-ci@canonical.com>"
-K8S_VERSION="{{ lookup('env', 'K8S_VERSION') }}"
-INCLUDE_SOURCE="{{ lookup('env', 'K8S_INCLUDE_SOURCE') }}"
 K8STEAMCI_GPG_KEY="{{ lookup('env', 'K8STEAMCI_GPG_KEY') }}"
 
 OPTS="--sign-key $K8STEAMCI_GPG_KEY"
@@ -17,5 +13,4 @@ if [ "$DRY_RUN" = "true" ]; then
 fi
 
 cd /root/jenkins
-pip3 install tox wheel
 tox --workdir .tox -e py38 -- python jobs/sync-upstream/sync.py debs $OPTS
diff --git a/jobs/sync-upstream.yaml b/jobs/sync-upstream.yaml
@@ -48,7 +48,7 @@
           JOB_SPEC_DIR: "jobs/build-debs"
       - run-tox:
           COMMAND: |
-            pip install ansible
+            pip install ansible wheel semver sh click
             bin/lxd-launcher teardown --container-name deb-build || true
             bin/lxd-launcher build \
               --container-name deb-build \