upgrade pip

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
charmed-kubernetes · Oct 6, 2020 · b4306e6 · b4306e6
1 parent 8016595
commit b4306e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/jobs/build-debs.yaml b/jobs/build-debs.yaml
@@ -30,11 +30,11 @@
           python3.8 -m venv venv
           venv/bin/python -m pip install pip-tools
           venv/bin/pip-sync requirements.txt
-          bin/lxd-launcher teardown --container-name deb-build
+          bin/lxd-launcher teardown --container-name deb-build || true
           bin/lxd-launcher build \
               --container-name deb-build \
               --playbook jobs/build-debs/debuilder-playbook.yml
-          sudo lxc exec deb-build -- base -c "/root/jenkins/run.sh"
+          sudo lxc exec deb-build -- bash -c "/root/jenkins/run.sh"
           bin/lxd-launcher teardown --container-name deb-build
 
 - job:

diff --git a/jobs/build-debs/debuilder-playbook.yml b/jobs/build-debs/debuilder-playbook.yml
@@ -25,6 +25,9 @@
           python3-dev \
           python3-pip \
           tox
+    - name: upgrade system pip
+      shell: |
+        pip3 install pip --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
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+set -x
+
 export CDKBOT_GH_USR="{{ lookup('env', 'CDKBOT_GH_USER') }}"
 export CDKBOT_GH_PSW="{{ lookup('env', 'CDKBOT_GH_PSW') }}"
 K8S_VERSION="{{ lookup('env', 'K8S_VERSION') }}"
 
-
 cd /root/jenkins
-TOX_WORK_DIR=.tox tox -e py3 -- python jobs/build-debs/build-debs.py build-debs \
+pip3 install -rrequirements.txt
+PYTHONPATH=. python3 jobs/build-debs/build-debs.py build-debs \
        --version "$K8S_VERSION"