Add run template script

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

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/jobs/build-debs.yaml b/jobs/build-debs.yaml
@@ -32,7 +32,8 @@
           venv/bin/pip-sync requirements.txt
           bin/lxd-launcher build \
               --container-name deb-build \
-              --playbook jobs/infra/debuilder-playbook.yml
+              --playbook jobs/build-debs/debuilder-playbook.yml
+          lxc exec deb-build -- "cd jenkins && bash run.sh"
           bin/lxd-launcher teardown --container-name deb-build
 
 - job:

diff --git a/jobs/infra/debuilder-playbook.yml → jobs/build-debs/debuilder-playbook.yml b/jobs/infra/debuilder-playbook.yml → jobs/build-debs/debuilder-playbook.yml
@@ -23,7 +23,8 @@
           ubuntu-dev-tools \
           wget \
           python3-dev \
-          python3-pip
+          python3-pip \
+          tox
     - name: copy bashrc
       copy:
         src: "fixtures/bashrc"
@@ -62,12 +63,9 @@
     - name: clone jenkins repo
       shell: |
         git clone https://github.com/charmed-kubernetes/jenkins
-    - name: run build
-      shell: |
-        export CDKBOT_GH_USR="{{ lookup('env', 'CDKBOT_GH_USER') }}"
-        export CDKBOT_GH_PSW="{{ lookup('env', 'CDKBOT_GH_PSW') }}"
-        pip3 install -rrequirements.txt
-        python3 jobs/build-debs/build-debs.py build-debs \
-              --version "{{ lookup('env', 'K8S_VERSION') }}"
-      args:
-        chdir: /root/jenkins
+    - name: copy run script
+      template:
+        src: "run.sh.j2"
+        dest: "/root/jenkins/run.sh"
+        owner: root
+        mode: 775
diff --git a/jobs/build-debs/run.sh.j2 b/jobs/build-debs/run.sh.j2
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export CDKBOT_GH_USR="{{ lookup('env', 'CDKBOT_GH_USER') }}"
+export CDKBOT_GH_PSW="{{ lookup('env', 'CDKBOT_GH_PSW') }}"
+K8S_VERSION="{{ lookup('env', 'K8S_VERSION') }}"
+TOX_WORK_DIR=.tox tox -e py3 -- python jobs/build-debs/build-debs.py build-debs \
+       --version "$K8S_VERSION"