Merge "Update cloud image Ubuntu16.04 mininet ovs"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
index dda4381e7d21b21bb9410a563e4ff0fb7e40ab7e..f74d5457d3a47313b51efb9ea9371a89a6714c2a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index e72391243c6163693c9e535cc409cda30766fcd8..eaee410f3c243f4fa0c1ca4710476bb81762e2d7 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=v1-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index accee7db2c1fbe112e67deca25eb4b15e2edf362..745feb18ee533877e6945b79e383e5665bb1cef5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index a391dc00e6a879b3d8db861cd52b583473e9e39f..8c7115414848fe81768a6509e89b5b518949a1fe 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 56a4f863747a66882b211eeec1da209eec5cb955..06f71ea76de7d989e78cfb7bef10460471b85721 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index dc2aaa756446efa92707659a02cf95fd22a392ab..62decbefe6d531fb279ae355fa13fefa719c0913 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-highcpu-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index cebc67cad69332407cc6cde928ff7260eda5ee08..1b80abc7c519ae500d4b2248faceab0e4eab0574 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=odl-highcpu-8

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 4f513d62c58be70594a7f9fc9ae96f70f21eb12a..4ddfca6d9d3b5dfad097f8a7215e0eff3eda3055 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 - x86_64 - 20191002-145719.577
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
 HARDWARE_ID=odl-standard-2
 INSTANCE_CAP=25

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index f39829c8757ea8699dab7d45b66935a1b158f647..93cbcb5f917c613fdab0238124fd3a3b076d0aa7 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200810-015814.993
 HARDWARE_ID=v1-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
index 3015e4c8e77e511fff40173c53203ad90454ecad..50ffbfac6ad46dfed8ee0c08d2df21345d735d3e 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200810-015814.993
 HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
index 4d31f6bff5eeb6de5a9a7d9c133bdac6c0c1852d..107c0c0f7c8316008b760b97ca366de4df7bb7cc 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200810-015814.993
 HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
index 38d8aa6eb8506b82f6786c4bf8c8114341dd46a3..021b24e3d41c028b626c35dad99ee972804b4859 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200810-015814.993
 HARDWARE_ID=odl-highcpu-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
index 7247d20d32f8371230d4a22faa584a8dc9def266..1705d63128477fd9f28cd20327df08f7b734ca1f 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200810-015814.993
 HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 46a768ca313a96711b3edbb18141f0917cc32c26..4bddff814a1ff1323b006fd37fb390665ab7412b 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script

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 2a597139a2d64c16dde1ed46f65324535c90f82c..4b39f3802127f469e4e2ae3f6c3579f6ba1b2f63 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 - x86_64 - 20191002-145719.577
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
 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 3344d10e4bad3a3d570881cd675a1c703c585108..ff4d5830fe8057267b4f28ebbfc4d51d015140f2 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 - x86_64 - 20191002-145719.577
+IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
index 0b8d865207f23939eb99396c20ea7475833db11f..92754edc82c4bcebfd30f57d6bce5d658e53faca 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200811-124252.042
 HARDWARE_ID=odl-standard-1

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index cbd532e5936f7a3538d2e77429c1601b46ff82a4..1980f77df94a823286db48255891552b89a44589 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -56,6 +56,11 @@ git status
 
 if [ "$BRANCH_CUT" = "false" ]; then
     lftools version release "$RELEASE_TAG"
+    commit_msg="Bump versions by x.y.(z+1)"
+else
+    commit_msg="Bump versions by x.(y+1).z"
+    # If we are branch cutting we also need to bump the docs/conf.yaml version
+    find . -type f -name conf.yaml -exec sed -i "s/version:.*/version: ${STREAM^}/" {} \;
 fi
 lftools version bump "$RELEASE_TAG"
 
@@ -64,7 +69,7 @@ pushd integration/distribution || true
     git checkout -f opendaylight/pom.xml || true
 popd || true
 
-git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
+git submodule foreach "git commit -asm '${commit_msg}'"
 # Only submodules need to be bumped, we can ignore autorelease's bump information
 git checkout -f
 

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index eef943fcefab9987f1f9e9d4982d84449e5f2f75..9f6e6b0f5e6c8473d24c1a1e8340178ebd116fce 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -87,7 +87,7 @@
     elasticsearch-attribute: "disabled"
 
     # CSIT images configuration
-    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200811-070703.256
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200811-042113.395
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 52aaac4cb66f6106ee5cef80aa8c7eaa1d4f3205..bde5060249019ea14eb6cf3705d0301124c81bf2 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -102,7 +102,7 @@ function install_openstack_clients_in_robot_vm() {
        sed -i s/python-openstackclient===3.14.0/python-openstackclient===3.16.3/ /tmp/constraints.txt
        sed -i s/keystoneauth1===3.10.1/keystoneauth1===3.18.0/ /tmp/constraints.txt
        sed -i s/openstacksdk===0.17.3/openstacksdk===0.48.0/ /tmp/constraints.txt
-       sed -i s/os-service-types===1.3.0/os-service-types===1.7.0/ /tmp/constraints.txt
+       sed -ie 's/os-service-types===.*/os-service-types===1.7.0/' /tmp/constraints.txt
        sed -i s/stevedore===1.29.0/stevedore\>=3.0.0/ /tmp/constraints.txt
        #Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
        sed -i '1 auwsgi===2.0.18' /tmp/constraints.txt

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77b2dae6143ba889f9d0806ca4cee6fbb6772c2a..5aef71e0bb27fe145f5ba128e5e3a1a5d0ad1e82 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -77,7 +77,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -185,7 +185,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -492,7 +492,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -603,7 +603,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     tools_system_count: "1"
     tools_system_flavor: "odl-highcpu-2"
@@ -912,7 +912,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     docker_system_count: "1"
     docker_system_flavor: "odl-standard-1"
@@ -1046,7 +1046,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "odl-standard-4"
@@ -1476,7 +1476,7 @@
 
     odl_system_count: 1
     odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "odl-standard-4"

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index e0a3cf008fc4fbb52d8e12de80459dd733c1748c..9c4f1e0231e7f2d346a8e5b9d30632a02b7721ed 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -146,7 +146,7 @@
       - silicon:
           branch: "master"
           karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-aluminium}"
+          csit-sanity-list: "{csit-sanity-list-silicon}"
       - aluminium:
           branch: "stable/aluminium"
           karaf-version: odl