Merge "Add linter job template/definition for integration repo"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index 75014db..37a375a 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh
index 42771af..474911d 100644 (file)
--- a/shell/run_releasedockerhub.sh
+++ b/shell/run_releasedockerhub.sh
@@ -18,7 +18,7 @@ set -euf -o pipefail
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv lftools
+lf-activate-venv zipp==1.1.0 lftools
 
 if [ ! -v RELEASEDOCKERHUB_ORG ]
 then