Merge "[CPS] Adding jobs for istanbul branch : Step 11"

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 f3f6e4c..1b3d97c 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v3-standard-2
-VOLUME_SIZE=20

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 469f189..43361f8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v3-standard-4
-VOLUME_SIZE=20

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 c26976b..d8ca726 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v3-standard-8
-VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index 8bb7c03..f72d6cc 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v3-standard-4
-VOLUME_SIZE=50

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 7676454..f0e69cd 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -6,8 +6,7 @@ CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
-VOLUME_SIZE=20
-HARDWARE_ID=v1-standard-1
+HARDWARE_ID=v3-standard-2
 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=75

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 9f9d867..b41ed8f 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -4,4 +4,3 @@ HARDWARE_ID=v3-standard-4
 INSTANCE_CAP=1
 NUM_EXECUTORS=4
 RETENTION_TIME=4320
-VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index f36cf96..7f93e17 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20211019-201056.707
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v3-standard-4
-VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index 772004b..38273e1 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v3-standard-16
-VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index 65d7369..93b99f8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v3-standard-8
-VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
index cd44cbc..1ec5262 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-2g
-HARDWARE_ID=lf-standard-2
-VOLUME_SIZE=20
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
index 47fa5e7..8b7593e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-4g
-HARDWARE_ID=lf-standard-4
-VOLUME_SIZE=20
+HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
index 76bfc70..b773196 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084
 LABELS=ubuntu1804-docker-v1-8c-8g
-HARDWARE_ID=v1-standard-8
-VOLUME_SIZE=50
+HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
index 5610c6a..e4aac19 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
 LABELS=ubuntu1804-memcached-4c-4g
 HARDWARE_ID=v3-standard-4
-VOLUME_SIZE=50

diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index a3bc20e..d9887e4 100644 (file)
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -14,17 +14,16 @@
           tox-dir: "."
           tox-envs: "doc8"
           pattern: "docs/**"
-      - "linkcheck":
-          tox-dir: "."
-          tox-envs: "docs-linkcheck"
-          pattern: "docs/**"
       - "sphinx":
           tox-dir: "."
-          tox-envs: "docs"
+          tox-envs: "docs,docs-linkcheck"
           pattern: "docs/**"
+          parallel: true
     stream:
       - "master":
           branch: "master"
+      - "honolulu":
+          branch: "honolulu"
       - "frankfurt":
           branch: "frankfurt"
       - "guilin":

diff --git a/packer/common-packer b/packer/common-packer
index e23ebc7..3dcae18 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit e23ebc7439c8692eff5aebf78782068ac1507221
+Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe