From: Thanh Ha (zxiiro) Date: Fri, 5 Jun 2020 22:33:21 +0000 (+0000) Subject: Merge "Fix validate-autorelease JAVA_HOME not set" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6c3ad33f8788dd455a5b56e08dd96e3f252bb495;hp=02f1186009927502f66759a97a419faa86ccbe11;p=releng%2Fbuilder.git Merge "Fix validate-autorelease JAVA_HOME not set" --- 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 5ab3289f9..f7ef63c7d 100644 --- 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 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752 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 e75e5302a..806e79ee7 100644 --- 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 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752 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 4f052ef41..c69951670 100644 --- 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 - 20191004-045622.840 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752 HARDWARE_ID=odl-standard-2 diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml new file mode 100644 index 000000000..64322fa83 --- /dev/null +++ b/jjb/autorelease/validate-autorelease-aluminium.yaml @@ -0,0 +1,37 @@ +--- +# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job +- project: + name: autorelease-validate-aluminium + jobs: + - '{project-name}-validate-autorelease-{stream}' + stream: aluminium + branch: master + project-name: + - aaa: + project: aaa + - bgpcep: + project: bgpcep + - daexim: + project: daexim + - genius: + project: genius + - infrautils: + project: infrautils + - integration-distribution: + project: integration/distribution + - jsonrpc: + project: jsonrpc + - lispflowmapping: + project: lispflowmapping + - netconf: + project: netconf + - netvirt: + project: netvirt + - neutron: + project: neutron + - openflowplugin: + project: openflowplugin + - ovsdb: + project: ovsdb + - serviceutils: + project: serviceutils diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml new file mode 100644 index 000000000..c44a919bb --- /dev/null +++ b/jjb/autorelease/view-autorelease-aluminium.yaml @@ -0,0 +1,39 @@ +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_aluminium + name: releng-view-autorelease-aluminium + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-Aluminium + description: 'List of Aluminium Merge jobs for Autorelease' + job-name: + - 'aaa-merge-aluminium' + - 'bgpcep-merge-aluminium' + - 'daexim-merge-aluminium' + - 'genius-merge-aluminium' + - 'infrautils-merge-aluminium' + - 'integration/distribution-merge-aluminium' + - 'jsonrpc-merge-aluminium' + - 'lispflowmapping-merge-aluminium' + - 'netconf-merge-aluminium' + - 'netvirt-merge-aluminium' + - 'neutron-merge-aluminium' + - 'openflowplugin-merge-aluminium' + - 'ovsdb-merge-aluminium' + - 'serviceutils-merge-aluminium' + <<: *releng_autorelease_view_common_aluminium diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index aeab9b814..d3ebc3396 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -87,9 +87,9 @@ 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 - 20200501-010133.750 openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559 - openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756 + openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080 # Default Robot framework options robot-options: '' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 422f3b160..1cb813769 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -82,7 +82,7 @@ controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### # Job configuration # @@ -191,7 +191,7 @@ controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### @@ -500,7 +500,7 @@ controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### # Job Configuration # @@ -612,7 +612,7 @@ controller-max-mem: '2048m' tools_system_count: '1' tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### # Job configuration # @@ -922,7 +922,7 @@ controller-max-mem: '2048m' docker_system_count: '1' docker_system_flavor: 'odl-standard-1' - docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' + docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752' ##################### # Job Configuration # @@ -1057,13 +1057,13 @@ controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' - openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154' openstack_system2_count: 0 openstack_system2_flavor: 'odl-standard-1' - openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### # Job configuration # @@ -1485,13 +1485,13 @@ controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' - openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154' openstack_system2_count: 0 openstack_system2_flavor: 'odl-standard-1' - openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' + openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' ##################### # Job configuration # diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 8b83aebe9..574dfc2c4 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -28,7 +28,7 @@ scope: 'only' # no mininet required - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250 # Features to install install-features: 'odl-netconf-callhome-ssh,odl-restconf' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 02f2ffbdc..60a8c5b9e 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -29,7 +29,7 @@ - all: scope: 'all' - tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610 + tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250 # Features to install install-features: > diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 80d00fb7a..27f79f1f5 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -17,7 +17,7 @@ openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -67,7 +67,7 @@ openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 @@ -116,7 +116,7 @@ openstack_system_flavor: odl-highcpu-8 openstack_system2_flavor: odl-highcpu-4 tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390 os-cmb-cnt: 0 os-ctl-cnt: 1 os-cmp-cnt: 2 diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 3fca0825a..cb35b60aa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -25,7 +25,7 @@ # Job images tools_system_count: 2 - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: 'odl-openflowplugin-flow-services-rest' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index be28da8d5..f4f6c94ca 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 27007e3d0..358ab1849 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index ff8f0e119..38341100f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 2e25311f6..3519fe0e8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 3c0b7c641..0facb7884 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -27,7 +27,7 @@ install: 'all' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 6fe25d0fd..223cdcf0f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -30,7 +30,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index c690cc11c..70fdc5d74 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index da81f9e39..151c35999 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: 'odl-openflowplugin-flow-services-rest' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 4c3fdfdb2..c0a3c9e13 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -27,7 +27,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 2f15c4062..3db4692bf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 54a71fbf3..a40ab4a53 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -26,7 +26,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 74a5ef9fc..7d0ee2593 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -28,7 +28,7 @@ scope: 'only' # Job images - tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013' # Features to install install-features: >