Merge "Auto Update CSIT Jobs to run for neon"

diff --git a/global-jjb b/global-jjb
index 0bc70d1762dc88b90d4f9aa99a2f3bbf2b55b078..a47a2c5d2839a34e22c67e9e1e6578efd5540ae2 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 0bc70d1762dc88b90d4f9aa99a2f3bbf2b55b078
+Subproject commit a47a2c5d2839a34e22c67e9e1e6578efd5540ae2

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 60204a9dfb992119c20f64564be1b58f3654fa7d..73e5e234fcd55f9b254e973e93dec9257fdd7145 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -8,18 +8,12 @@
           build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}':
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     stream:
-      - aluminium:
-          branch: 'master'
-          integration-test: aluminium
-      - magnesium:
-          branch: 'stable/magnesium'
-          integration-test: magnesium
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
@@ -56,6 +50,7 @@
     jobs:
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
 
     stream:
       - aluminium:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index cb434a3b0760128cfafb9a0396a2995f271f6227..8667b2331a04f90a5896f31efe2bf4e8cc85f059 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -349,7 +349,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: autorelease-version-bump-{stream}
+    name: autorelease-version-bump-{stream}-{mvn-version}-{java-version}
 
     #####################
     # Default variables #
@@ -421,6 +421,8 @@
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-provide-maven-settings:

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 85b10ed39b52aa413c04c9576b4b160445797a5e..245692b0d06f1d1634306e87e1b607245f76fff9 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -187,6 +187,9 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-sanity-list-aluminium: >
+        openflowplugin-csit-1node-sanity-only-aluminium,
+        distribution-sanity-aluminium
     csit-sanity-list-magnesium: >
         openflowplugin-csit-1node-sanity-only-magnesium,
         distribution-sanity-magnesium
@@ -196,6 +199,15 @@
     csit-sanity-list-neon: >
         openflowplugin-csit-1node-sanity-only-neon,
         distribution-sanity-neon
+    csit-weekly-list-aluminium: >
+        controller-csit-1node-notifications-longevity-only-aluminium,
+        controller-csit-3node-drb-partnheal-longevity-only-aluminium,
+        controller-csit-3node-drb-precedence-longevity-only-aluminium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
+        distribution-deploy-aluminium,
+        distribution-offline-aluminium,
+        openflowplugin-csit-1node-longevity-only-aluminium
     csit-weekly-list-magnesium: >
         controller-csit-1node-notifications-longevity-only-magnesium,
         controller-csit-3node-drb-partnheal-longevity-only-magnesium,

diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
index b5b03b53a9d74d8f87e90c1d5b5e7fa2a6a8ed2e..4dc15cadf31e350b3352bab289a9eaf5fb48d821 100644 (file)
--- a/jjb/integration/csit-jobs-aluminium.lst
+++ b/jjb/integration/csit-jobs-aluminium.lst
@@ -1,77 +1,51 @@
-aaa-csit-1node-authn-all-sodium,
-bgpcep-csit-1node-bgp-ingest-all-sodium,
-bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
-bgpcep-csit-1node-throughpcep-all-sodium,
-bgpcep-csit-1node-userfeatures-all-sodium,
-bgpcep-csit-3node-bgpclustering-all-sodium,
-bgpcep-csit-3node-bgpclustering-ha-only-sodium,
-controller-csit-1node-akka1-all-sodium,
-controller-csit-1node-benchmark-all-sodium,
-controller-csit-1node-rest-cars-perf-all-sodium,
-controller-csit-3node-benchmark-all-sodium,
-controller-csit-3node-clustering-ask-all-sodium,
-controller-csit-3node-clustering-tell-all-sodium,
-controller-csit-3node-rest-clust-cars-perf-ask-only-sodium,
-controller-csit-3node-rest-clust-cars-perf-tell-only-sodium,
-daexim-csit-1node-basic-only-sodium,
-daexim-csit-3node-clustering-basic-only-sodium,
-distribution-csit-1node-userfeatures-all-sodium,
-distribution-csit-managed-sodium,
-genius-csit-1node-upstream-only-sodium,
-genius-csit-3node-upstream-only-sodium,
-lispflowmapping-csit-1node-msmr-all-sodium,
-lispflowmapping-csit-1node-performance-only-sodium,
-lispflowmapping-csit-3node-msmr-all-sodium,
-mdsal-csit-1node-bindingv1-only-sodium,
-netconf-csit-1node-callhome-only-sodium,
-netconf-csit-1node-scale-max-devices-only-sodium,
-netconf-csit-1node-scale-only-sodium,
-netconf-csit-1node-userfeatures-all-sodium,
-netconf-csit-3node-clustering-only-sodium,
-netconf-csit-3node-clustering-scale-only-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium,
-odltools-csit-1node-upstream-all-sodium,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-sodium,
-openflowplugin-csit-1node-cbench-only-sodium,
-openflowplugin-csit-1node-flow-services-all-sodium,
-openflowplugin-csit-1node-perf-bulkomatic-only-sodium,
-openflowplugin-csit-1node-perf-stats-collection-only-sodium,
-openflowplugin-csit-1node-scale-link-only-sodium,
-openflowplugin-csit-1node-scale-only-sodium,
-openflowplugin-csit-1node-scale-switch-only-sodium,
-openflowplugin-csit-3node-clustering-bulkomatic-only-sodium,
-openflowplugin-csit-3node-clustering-only-sodium,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sodium,
-ovsdb-csit-1node-upstream-southbound-all-sodium,
-ovsdb-csit-3node-upstream-clustering-only-sodium,
-sfc-csit-3node-docker-full-deploy-all-sodium,
-sfc-csit-3node-rest-basic-all-sodium,
-yangtools-csit-1node-system-only-sodium,
+aaa-csit-1node-authn-all-aluminium,
+bgpcep-csit-1node-bgp-ingest-all-aluminium,
+bgpcep-csit-1node-bgp-ingest-mixed-all-aluminium,
+bgpcep-csit-1node-throughpcep-all-aluminium,
+bgpcep-csit-1node-userfeatures-all-aluminium,
+bgpcep-csit-3node-bgpclustering-all-aluminium,
+bgpcep-csit-3node-bgpclustering-ha-only-aluminium,
+controller-csit-1node-akka1-all-aluminium,
+controller-csit-1node-benchmark-all-aluminium,
+controller-csit-1node-rest-cars-perf-all-aluminium,
+controller-csit-3node-benchmark-all-aluminium,
+controller-csit-3node-clustering-ask-all-aluminium,
+controller-csit-3node-clustering-tell-all-aluminium,
+controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
+controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
+daexim-csit-1node-basic-only-aluminium,
+daexim-csit-3node-clustering-basic-only-aluminium,
+distribution-csit-1node-userfeatures-all-aluminium,
+distribution-csit-managed-aluminium,
+genius-csit-1node-upstream-only-aluminium,
+genius-csit-3node-upstream-only-aluminium,
+jsonrpc-csit-1node-basic-only-aluminium,
+lispflowmapping-csit-1node-msmr-all-aluminium,
+lispflowmapping-csit-1node-performance-only-aluminium,
+lispflowmapping-csit-3node-msmr-all-aluminium,
+mdsal-csit-1node-bindingv1-only-aluminium,
+netconf-csit-1node-callhome-only-aluminium,
+netconf-csit-1node-scale-max-devices-only-aluminium,
+netconf-csit-1node-scale-only-aluminium,
+netconf-csit-1node-userfeatures-all-aluminium,
+netconf-csit-1node-userfeatures-rfc8040-all-aluminium,
+netconf-csit-3node-clustering-only-aluminium,
+netconf-csit-3node-clustering-scale-only-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-aluminium,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-aluminium,
+odltools-csit-1node-upstream-all-aluminium,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-aluminium,
+openflowplugin-csit-1node-cbench-only-aluminium,
+openflowplugin-csit-1node-flow-services-all-aluminium,
+openflowplugin-csit-1node-perf-bulkomatic-only-aluminium,
+openflowplugin-csit-1node-perf-stats-collection-only-aluminium,
+openflowplugin-csit-1node-scale-link-only-aluminium,
+openflowplugin-csit-1node-scale-only-aluminium,
+openflowplugin-csit-1node-scale-switch-only-aluminium,
+openflowplugin-csit-3node-clustering-bulkomatic-only-aluminium,
+openflowplugin-csit-3node-clustering-only-aluminium,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-aluminium,
+ovsdb-csit-1node-upstream-southbound-all-aluminium,
+ovsdb-csit-3node-upstream-clustering-only-aluminium,
+yangtools-csit-1node-system-only-aluminium,

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index 634406388991477da86a00900ad581bf98418266..68cef3850647fcef5c5d4a34b508f3e2d70f555b 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -28,6 +28,7 @@ netconf-csit-1node-callhome-only-magnesium,
 netconf-csit-1node-scale-max-devices-only-magnesium,
 netconf-csit-1node-scale-only-magnesium,
 netconf-csit-1node-userfeatures-all-magnesium,
+netconf-csit-1node-userfeatures-rfc8040-all-magnesium,
 netconf-csit-3node-clustering-only-magnesium,
 netconf-csit-3node-clustering-scale-only-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index b5b03b53a9d74d8f87e90c1d5b5e7fa2a6a8ed2e..43f1e2981ff877cf1eaa7e1ae759ea28c6ba82f2 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -27,6 +27,7 @@ netconf-csit-1node-callhome-only-sodium,
 netconf-csit-1node-scale-max-devices-only-sodium,
 netconf-csit-1node-scale-only-sodium,
 netconf-csit-1node-userfeatures-all-sodium,
+netconf-csit-1node-userfeatures-rfc8040-all-sodium,
 netconf-csit-3node-clustering-only-sodium,
 netconf-csit-3node-clustering-scale-only-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 93b2925fe7a4bbda855e3ad70de6f399f093bbd7..772ba0750bc1301e466e7bb0a21d78c6080cc4bc 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -72,7 +72,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           jre: 'openjdk11'
@@ -91,6 +91,25 @@
               openflowplugin-maven-merge-{stream},
               ovsdb-maven-merge-{stream},
               serviceutils-maven-merge-{stream},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
       - sodium:
           branch: 'stable/sodium'
           dependencies: >
@@ -149,12 +168,18 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
       - sodium:
           branch: 'stable/sodium'
           karaf-version: odl
@@ -186,9 +211,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index eb179df976200ba735fafeab465550d65ed8d05a..0b06e561b67045253fa98b03478a9777ea738b70 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -67,8 +67,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
+              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-aluminium.lst
+          csit-weekly-list: '{csit-weekly-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
           csit-blacklist: >
               alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
               of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
@@ -112,9 +124,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-aluminium}'
+      - magnesium:
+          branch: 'stable/magnesium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'