summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg2
-rw-r--r--packer/provision/local-builder.yaml9
-rw-r--r--packer/provision/local-docker.yaml9
5 files changed, 17 insertions, 7 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 57bc08268..a5b4bd9d0 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200220-190206.299
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
LABELS=centos7-builder-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index ef5f7235e..209cb0e97 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200220-190206.299
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
LABELS=centos7-builder-4c-4g
HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index fa6448ef5..edbfd3426 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200220-190109.738
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324
LABELS=centos7-docker-8c-8g
HARDWARE_ID=v2-highcpu-8
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 992cd485f..61cc50980 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -19,9 +19,14 @@
become: true
when: ansible_distribution == 'Ubuntu'
- - name: Install python-tox
+ - name: Install python-tox and deps
pip:
- name: tox
+ name:
+ - tox
+ - tox-pyenv
+ - virtualenv
+ - more-itertools~=5.0.0
+ - zipp==1.0.0
state: present
become: true
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 37e857fdd..d54746f08 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -60,9 +60,14 @@
become: true
when: ansible_distribution == 'Ubuntu'
- - name: Install python-tox
+ - name: Install python-tox and deps
pip:
- name: tox
+ name:
+ - tox
+ - tox-pyenv
+ - virtualenv
+ - more-itertools~=5.0.0
+ - zipp==1.0.0
state: present
become: true