another attempt to fix tox issues in focal

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

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/bin/lxd-launcher b/bin/lxd-launcher
@@ -22,7 +22,7 @@ def cli():
 @click.option("--ssh-import-id", help="SSH public key to import", default="cdkbot")
 @click.option("--key-file", help="SSH Key to connect to container with", default="/var/lib/jenkins/.ssh/cdkbot_rsa")
 def build(container_name, playbook, ssh_import_id, key_file):
-    cmd_ok(f"sudo lxc launch ubuntu:20.10 {container_name}")
+    cmd_ok(f"sudo lxc launch ubuntu:20.04 {container_name}")
     lxc_ip = None
     while not lxc_ip:
         lxc_info = capture(f"sudo lxc info {container_name}")

diff --git a/jobs/build-debs/debuilder-playbook.yml b/jobs/build-debs/debuilder-playbook.yml
@@ -27,7 +27,7 @@
           tox
     - name: remove apt deps
       shell: |
-          apt-get remove -qyf python3-tox
+          apt remove --autoremove -qyf tox
       ignore_errors: yes
     - name: upgrade system pip
       shell: |

diff --git a/jobs/build-debs/run.sh.j2 b/jobs/build-debs/run.sh.j2
@@ -13,4 +13,5 @@ if [ "$DRY_RUN" = "true" ]; then
 fi
 
 cd /root/jenkins
+
 tox -e py3 --workdir .tox -- python jobs/sync-upstream/sync.py debs $OPTS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,5 @@ if [ "$DRY_RUN" = "true" ]; then
		fi

		cd /root/jenkins

		tox -e py3 --workdir .tox -- python jobs/sync-upstream/sync.py debs $OPTS