From: Thanh Ha (zxiiro) Date: Wed, 12 Aug 2020 16:51:01 +0000 (+0000) Subject: Merge "Update cloud image Ubuntu16.04 mininet ovs" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2da551a76f5733589368c4292c3facc77a802e3e;hp=ca5f500ca731fe375474c80dd1aaf93f3e2e99e9;p=releng%2Fbuilder.git 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 dda4381e7..f74d5457d 100644 --- 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 e72391243..eaee410f3 100644 --- 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 accee7db2..745feb18e 100644 --- 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 a391dc00e..8c7115414 100644 --- 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 56a4f8637..06f71ea76 100644 --- 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 dc2aaa756..62decbefe 100644 --- 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 cebc67cad..1b80abc7c 100644 --- 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 4f513d62c..4ddfca6d9 100644 --- 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 f39829c87..93cbcb5f9 100644 --- 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 3015e4c8e..50ffbfac6 100644 --- 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 4d31f6bff..107c0c0f7 100644 --- 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 38d8aa6eb..021b24e3d 100644 --- 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 7247d20d3..1705d6312 100644 --- 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 46a768ca3..4bddff814 100644 --- 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 2a597139a..4b39f3802 100644 --- 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 3344d10e4..ff4d5830f 100644 --- 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 0b8d86520..92754edc8 100644 --- 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 cbd532e59..1980f77df 100644 --- 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 eef943fce..9f6e6b0f5 100644 --- 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 52aaac4cb..bde506024 100644 --- 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 77b2dae61..5aef71e0b 100644 --- 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 e0a3cf008..9c4f1e023 100644 --- 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