Merge "Support openjdk11 in CSIT magnesium"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index 3a5ab6cca2d6812577fe95db134b08b8c8992e3b..5ab3289f93d6f1377267586079a8e82e3394b027 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index be50d245d961a2945c40abfec5a2b2189e47e628..e75e5302a9728a80e69f62551b67f44aed451537 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index 58ba25b3d05409fd48e3e0e3bfc1fa6676e0de57..4f052ef41eabd09666b59f57a408cffed3c6e40a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
index 6b06986b45a8366cc8e61e84c6dbb0228d7e20c1..4f513d62c58be70594a7f9fc9ae96f70f21eb12a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 HARDWARE_ID=odl-standard-2
 INSTANCE_CAP=25

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
index 5230f4ef42bb5527b750d4fde5ce24934994aac1..2a597139a2d64c16dde1ed46f65324535c90f82c 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
index 0a149392c76256032fb480a75c960c609bd293f5..3344d10e4bad3a3d570881cd675a1c703c585108 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh
index 29e065ea3c3f76a86781d92e920e0609f531155b..342786b8b6a78b24882412a6fbf2952015fb8a25 100644 (file)
--- a/jjb/autorelease/branch-cut.sh
+++ b/jjb/autorelease/branch-cut.sh
@@ -28,6 +28,8 @@ LOG_FILE="$WORKSPACE/archives/branch-cut.log"
 
 set -eu -o pipefail
 
+pip install --user --quiet --upgrade git-review
+
 # Validate inputs
 if [ -z "$RELEASE" ]; then
     echo "ERROR: RELEASE variable must be set to a release name. Eg Carbon"

diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh
index a3b3c9c3071861786bbd46fd221f040772d45929..c741d75aafaf4ea72fd7377a9f1433c1dff90aba 100644 (file)
--- a/jjb/autorelease/generate-release-notes.sh
+++ b/jjb/autorelease/generate-release-notes.sh
@@ -13,6 +13,8 @@
 
 set -x
 
+pip install --user --quiet --upgrade git-review
+
 RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')}
 if [ -z "$RELEASE" ]; then
     echo "ERROR: The RELEASE variable is not set."

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 23d062f4fbc1157d355bd3f25c5d3437432ce2d0..cbd532e5936f7a3538d2e77429c1601b46ff82a4 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -26,6 +26,8 @@ BRANCH="$GERRIT_BRANCH"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
+pip install --user --quiet --upgrade git-review
+
 # Fail if branch cutting is not on master
 if [ "$BRANCH_CUT" = "true" ] && [ "$BRANCH" != "master" ]; then
     echo "ERROR: Cannot branch cut on $BRANCH, its required to be on the master branch."

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 04b1d491fbf44b30e6007cf2afc446b055c7d765..9d524b2d9ca0d83c0c1c652e5818b2acf127c4b3 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -83,7 +83,7 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
 
     # Default Robot framework options

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6e3b28c3549fbb4e3ef9762a5bb824177e4e6d50..a1e46356bc267fa8bd2696f415772375e92fe330 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -904,7 +904,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
-    docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
     #####################
     # Job Configuration #
@@ -1036,10 +1036,10 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -1448,10 +1448,10 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'