Merge "Update cloud image Ubuntu18.04 helm x86_64"
authorRobert Varga <nite@hq.sk>
Wed, 18 May 2022 15:02:01 +0000 (15:02 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 18 May 2022 15:02:01 +0000 (15:02 +0000)
125 files changed:
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-helm-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-helm-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml [deleted file]
jjb/aaa/aaa.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-branch-lock.yaml
jjb/autorelease/autorelease-gerrit-branch-lock.sh
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-chlorine.yaml [moved from jjb/autorelease/validate-autorelease-silicon.yaml with 76% similarity]
jjb/autorelease/validate-autorelease-sulfur.yaml
jjb/autorelease/view-autorelease-chlorine.yaml [new file with mode: 0644]
jjb/autorelease/view-autorelease-silicon.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml [deleted file]
jjb/bgpcep/bgpcep.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml [deleted file]
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/docs/docs-rtd.yaml
jjb/docs/docs-template.yaml
jjb/docs/docs_version_bump.sh
jjb/docs/docs_version_bump_projects.sh
jjb/genius/genius-patch-test.yaml [deleted file]
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-chlorine.lst
jjb/integration/csit-jobs-silicon.lst [deleted file]
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml [deleted file]
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-csit-netty-replication.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-distribution-mri-test.yaml
jjb/netconf/netconf-patch-test.yaml [deleted file]
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netvirt/netvirt-patch-test.yaml [deleted file]
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlmicro/odlmicro-csit.yaml
jjb/odlmicro/odlmicro.yaml
jjb/odlparent/odlparent.yaml
jjb/odlsaf/odlsaf.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/helm.yaml
jjb/packaging/packaging.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/transportpce/transportpce.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml [deleted file]
jjb/yangtools/yangtools.yaml
scripts/cut-branch-jobs.py

index 451a5a296005c471801933a676602b1bdd42e7e2..27cc9b2faf6775c0e56a268858eb6077f0f09884 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-2
index 7113dd5bf198ef37af68c7f45a8618f6e076434d..4bd7d664a031d4d10d79132fcc1efa27a000c654 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-2
index 459654de0112f2948290fde55d80f7d5ea9a7b8d..702b82970fbc2af9ffc4b47ac4d924ff49e92395 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-2
index 07166980e1dc8926f084fce583900b5994ddfd0a..4ff4a0c3564ed29d3ff4314a91bfdc953b7c2b5a 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-4
index e17fffe91632b6249654fbd4a6a6f33f1a4f406b..29b23184801075e05849d7ea2a57b1b35f001516 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-4
index 25a4186723884ccaeddb524c835d12c68877ced2..f6ba7f6ceefa55e69b36c8ac85e5c09f3da8254e 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 HARDWARE_ID=v3-standard-8
index 9c5a34c1cfc925423aac9260959ac8a2ad0c5c0a..84cf699e131aa72fde751948ccc4d8c88ab85d55 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-helm-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20211217-010326.708
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 HARDWARE_ID=v3-standard-2
index 6725f5c95794d75fe957c69c7cfc14dd7b74af77..a5cbe04c5164d97cabb617ec437da5aa0fd7a4f4 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos7-helm-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20211217-010326.708
+IMAGE_NAME=ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 HARDWARE_ID=v3-standard-4
index 694f60f05bfb0719b9f6f6859ea6e27547c9aa35..66bfdea1750599b0a2481827688a3c182a6ddc75 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-2
index 0ae153f8809cbf7d1e29d864aec439275edefbab..b3642ee762e0795e50aa1288bec91c85449e1f99 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-2
index 2c3f73262e58f95953996af701af480b4b6eed70..52c506cc845e42a32838ab2200771d62d5f1ae1f 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-2
index 319f0b09c6f9703d658a01fe05c6f0c2cec8aac6..18d6b0279c48c9616fa4af516c005665f9a72f98 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-4
index 9879e5b9e099e8279c5acdb59901f9754824b90a..26ebfe7c1fcd6b6acd3eb817bcd824779ec45a01 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-025029.496
 HARDWARE_ID=v3-standard-8
index 47fb6e37879d897af853b688cbdef43afa86c9e9..eceb4781ecafeb5c37059e0231eab1f5908adbfd 100644 (file)
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331
 AVAILABILITY_ZONE=nova
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
index 7c03236bd91128ac8bb81caaaa0ccb4c6ca71543..577edfe277ed9deca1ceed52889ba075dbb6710a 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-2c-2g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357
 HARDWARE_ID=v3-standard-2
index 2d44db571ce1c14db5dc4817826ded63972b4420..f40637b3ed090b071c7dca460c8c1cd799f5e5cd 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-docker-4c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357
 HARDWARE_ID=v3-standard-4
index 29d1b79b6ae299f73c7acc98256fb043d45f5d29..8055fa06b431ba7b96a39df25338d9d7deb28cbc 100644 (file)
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-28-1c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220201-180056.429
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220501-180100.971
 HARDWARE_ID=v3-standard-2
index a50867cd2cc078fc87ad4995ed22f4c7ef2af10d..b4c289f728afbe33d2bbe66518f23f804b196090 100644 (file)
@@ -22,9 +22,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
deleted file mode 100644 (file)
index 71ecff8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: aaa-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: "aaa"
-
-    stream:
-      - chlorine:
-          branch: "master"
-          java-version: "openjdk11"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
-
-    os-branch: "queens"
-
-    feature:
-      - authn:
-          csit-list: >
-            aaa-csit-1node-authn-all-{stream}
-
-      - keystone:
-          csit-list: >
-            aaa-csit-1node-keystone-all-{stream}
-
-      - netvirt:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
-      - cluster-netvirt:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
-      - genius:
-          csit-list: >
-            genius-csit-1node-gate-only-{stream}
index b09d408dee3f7aff2bf1beb3c11ede64b8c0404f..c975e3a8bdf2f3d3fe472e8913588e1e18c944bb 100644 (file)
@@ -7,18 +7,16 @@
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     stream: master
     project: "aaa"
     project-name: "aaa"
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
+    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -26,7 +24,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.14.x
+    name: aaa-0.15.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+        build-node: centos8-builder-4c-4g
 
-    stream: 0.14.x
+    stream: 0.15.x
     project: "aaa"
     project-name: "aaa"
-    branch: 0.14.x
+    branch: 0.15.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -48,8 +48,9 @@
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
+
 - project:
-    name: aaa-0.13.x
+    name: aaa-0.14.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: 0.13.x
+    stream: 0.14.x
     project: "aaa"
     project-name: "aaa"
-    branch: 0.13.x
+    branch: 0.14.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
     project: "aaa"
     project-name: "aaa"
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
+    build-node: centos8-builder-4c-4g
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"
index 5d8544ff08ce79affbec042aa06fe312fd4a3c7a..6e203b1e4af7637ce9b38879d5322e8011ea191f 100644 (file)
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
-- project:
-    name: archetypes-silicon
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "archetypes"
-    project-name: "archetypes"
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "archetypes-settings"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
-    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: d88dcfe6ce48d
-
 - project:
     name: archetypes-sonar
     jobs:
index 9b5e639867ccb2dded2c0eb93c77a68cbf021b72..1daa333d12423f8a80ed50df2001a3b1a476a4c2 100644 (file)
           project: "{project}"
           stream: "{stream}"
           branch: "{branch}"
+      - string:
+          name: GERRIT_BRANCH_NEXT
+          default: ""
+          description: |
+            Gerrit parameter to identify a new Gerrit branch for branch cutting.
+            ex: stable/sulfur, stable/chlorine
       - bool:
           name: DRY_RUN
           default: true
       - choice:
           name: GERRIT_ACCESS_MODE
           choices:
+            - branch-cut
             - code-freeze
             - supercommitters
             - release-prep
             - unlock
           description: |
+            If BRANCH_CUT is selected then the GERRIT_BRANCH and master is locked for registered users.
             If CODE_FREEZE is selected then the GERRIT_BRANCH is locked for registered users.
             If RELEASE_PREP is selected then the GERRIT_BRANCH is locked for registered users and unlocked for RELENG.
             If SUPERCOMMITTERS is selected then supercommitters rights are granted on the GERRIT_BRANCH.
@@ -86,5 +94,3 @@
           branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
index 3e9b4de08de150b9d2eabe1be17bdc442420cd5c..e3c6a8bfe17c9f4eb8f26ec94968173da861a9eb 100644 (file)
@@ -45,8 +45,31 @@ install_gerrit_hook() {
 install_gerrit_hook
 
 mode="${GERRIT_ACCESS_MODE}"
-
+set -x
 case $mode in
+    branch-cut)
+        if [ "${GERRIT_BRANCH}" == "master" ] && [[ "${GERRIT_BRANCH_NEXT}" =~ stable ]]; then
+            echo "INFO: Locking branch for new branch cutting: ${GERRIT_BRANCH_NEXT}"
+            git config -f project.config "access.refs/for/refs/heads/${GERRIT_BRANCH_NEXT}.exclusiveGroupPermissions" "create"
+            git config -f project.config "access.refs/for/refs/heads/${GERRIT_BRANCH_NEXT}.create" "block group Registered Users"
+            git config -f project.config --add "access.refs/for/refs/heads/${GERRIT_BRANCH_NEXT}.create" "group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH_NEXT}.label-Code-Review" "-2..+2 group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH_NEXT}.label-Verified" "-1..+1 group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH_NEXT}.submit" "block group Registered Users"
+            git config -f project.config --add "access.refs/heads/${GERRIT_BRANCH_NEXT}.submit" "group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH_NEXT}.exclusiveGroupPermissions" "submit"
+            git config -f project.config --add "access.refs/heads/*.create" "group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.label-Code-Review" "-2..+2 group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.label-Verified" "-1..+1 group Release Engineering Team"
+            git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.submit" "block group Registered Users"
+            git config -f project.config --add "access.refs/heads/${GERRIT_BRANCH}.submit" "group Release Engineering Team"
+            git commit -asm "Chore: Lock for new branch cutting: ${GERRIT_BRANCH_NEXT}"
+        else
+            echo "ERROR: Cannot perform branch cutting on non-master branch."
+            echo "ERROR: stable branch should be ex: stable/sulfur"
+            exit 1
+        fi
+        ;;
     supercommitters)
         echo "INFO: Locking branch for MRI: ${GERRIT_BRANCH}"
         git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.exclusiveGroupPermissions" "submit"
index 27cb24d304ede69167469ae8eb1c993a1c2beea6..fd60982114c993c5008c3b6c86a5dd084ec3f524 100644 (file)
     stream:
       - chlorine:
           branch: "master"
-          integration-test: sulfur
+          integration-test: chlorine
       - sulfur:
           branch: "stable/sulfur"
           integration-test: sulfur
       - phosphorus:
           branch: "stable/phosphorus"
           integration-test: phosphorus
-      - silicon:
-          branch: "stable/silicon"
-          integration-test: silicon
 
     project: releng/autorelease
     project-name: autorelease
       -Dsft.heap.max=4g
     java-version: "openjdk11"
 
+- project:
+    name: autorelease-projects-openjdk17
+    jobs:
+      - "autorelease-release-{stream}-{mvn-version}-{java-version}":
+          build-node: centos8-builder-4c-16g
+
+    stream:
+      - chlorine:
+          branch: "master"
+          integration-test: chlorine-dev-null
+
+    project: releng/autorelease
+    project-name: autorelease
+    build-node: centos8-builder-2c-8g
+    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
+    archive-artifacts: >
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
+    staging-profile-id: 425e43800fea70
+    # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+      -PrepoBuild
+      -P!karaf
+      -Pignore-lispflowmapping-integrationtest
+      -Dcheckstyle.skip=true
+      -Dskip.karaf.featureTest=true
+      -Dsft.heap.max=4g
+    java-version: "openjdk17"
+
 - project:
     name: autorelease-info
     jobs:
index df731482a18a5365e99da657dbe452bc571490b2..5e05e77878d6480fee8413a9176961b92efc6abf 100644 (file)
           name: RELEASE
           description: |
             Release to generate release notes for.
-            Eg. Silicon-SR1, Phosphorus-SR2 ...
+            Eg. Sulfur-SR1, Phosphorus-SR2 ...
     scm:
       - lf-infra-gerrit-scm:
           git-url: "$GIT_URL/$GERRIT_PROJECT"
index ca12adcdc6bd9bd0d50ef0aa78e73554f0c6d274..2a5dbdcd81d485303f0605b9769f782f22beaf86 100644 (file)
@@ -17,5 +17,3 @@
           branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
similarity index 76%
rename from jjb/autorelease/validate-autorelease-silicon.yaml
rename to jjb/autorelease/validate-autorelease-chlorine.yaml
index be49e91514339ee14b1eb9b9ac42220f59768835..cd7acaf48e6622b2cf4fbfba48da9161e62f6d1d 100644 (file)
@@ -1,14 +1,12 @@
 ---
 # Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
 - project:
-    name: autorelease-validate-silicon
+    name: autorelease-validate-chlorine
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
-    stream: silicon
-    branch: stable/silicon
+    stream: chlorine
+    branch: master
     project-name:
-      - bgpcep:
-          project: bgpcep
       - daexim:
           project: daexim
       - integration-distribution:
@@ -17,8 +15,6 @@
           project: jsonrpc
       - lispflowmapping:
           project: lispflowmapping
-      - neutron:
-          project: neutron
       - openflowplugin:
           project: openflowplugin
       - ovsdb:
index a620f12c88a64ee44243d675fd4b56b4dce1d3f9..240cf333364b11086c5d9934f4de9133946e65dc 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - "{project-name}-validate-autorelease-{stream}"
     stream: sulfur
-    branch: master
+    branch: stable/sulfur
     project-name:
       - daexim:
           project: daexim
diff --git a/jjb/autorelease/view-autorelease-chlorine.yaml b/jjb/autorelease/view-autorelease-chlorine.yaml
new file mode 100644 (file)
index 0000000..a4421a2
--- /dev/null
@@ -0,0 +1,32 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_chlorine
+    name: releng-view-autorelease-chlorine
+    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-Chlorine
+    description: "List of Chlorine Merge jobs for Autorelease"
+    job-name:
+      - "daexim-maven-merge-chlorine"
+      - "integration/distribution-maven-merge-chlorine"
+      - "jsonrpc-maven-merge-chlorine"
+      - "lispflowmapping-maven-merge-chlorine"
+      - "openflowplugin-maven-merge-chlorine"
+      - "ovsdb-maven-merge-chlorine"
+      - "serviceutils-maven-merge-chlorine"
+    <<: *releng_autorelease_view_common_chlorine
diff --git a/jjb/autorelease/view-autorelease-silicon.yaml b/jjb/autorelease/view-autorelease-silicon.yaml
deleted file mode 100644 (file)
index d8bc77b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_silicon
-    name: releng-view-autorelease-silicon
-    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-Silicon
-    description: "List of Silicon Merge jobs for Autorelease"
-    job-name:
-      - "bgpcep-maven-merge-silicon"
-      - "daexim-maven-merge-silicon"
-      - "integration/distribution-maven-merge-silicon"
-      - "jsonrpc-maven-merge-silicon"
-      - "lispflowmapping-maven-merge-silicon"
-      - "neutron-maven-merge-silicon"
-      - "openflowplugin-maven-merge-silicon"
-      - "ovsdb-maven-merge-silicon"
-      - "serviceutils-maven-merge-silicon"
-    <<: *releng_autorelease_view_common_silicon
index 46df826963e3387f73faacf83b3a20cdc4f4ce2e..1cfa4881640a6f5c7392615e34d11ba0c88bc01f 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index 41535e56ccc69e906cb77a7ca9b7d27cfeb00d66..c04a885064007ffee967f4021f3f50196062204d 100644 (file)
@@ -22,9 +22,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index 6d3fed52c9fe0a5cc9ce994bb93efe99b5592d29..e8b5aa915e3eeb89f4fe1312d8b0590db9b9bc25 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index 04e1733521ceb233d0c36646eae0361f99fdb5bd..af02fab205d35c6174464c0fc2d6b01c034ca9cc 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index 452b2081588214302caa49eccf6d58c3a4fc9017..9fe5367055c1f1241ae5adc277b384255fed53bb 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index c1b793d7939d682c627667ae8e310e4d4914f5db..d886bb9de34968e1347a7aa90c54cba9a28ea466 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
index af305f57a25acc883740305714248b811a790a73..5f527c601c6afe93692784c570137dfeb7300237 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: bgpcep
 
diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
deleted file mode 100644 (file)
index d7a2658..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: bgpcep-patch-test
-    jobs:
-      - inttest-mri-patch-test
-
-    # The project name
-    project: "bgpcep"
-
-    # Project branches
-    stream:
-      - chlorine:
-          branch: "master"
-          java-version: "openjdk11"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
-
-    karaf-version: bgpcep
-
-    feature:
-      - bgp:
-          csit-list: >
-            bgpcep-csit-1node-gate-userfeatures-all-{stream},
-            bgpcep-csit-1node-gate-bgp-ingest-mixed-all-{stream}
-
-      - pcep:
-          csit-list: >
-            bgpcep-csit-1node-gate-userfeatures-all-{stream},
-            bgpcep-csit-1node-gate-throughpcep-all-{stream}
index 6f43ea3e919b72194d918221236dbf221a85de60..12a43f3347b9f8d46f5c1ab974f8768d48bbb554 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: bgpcep
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
-          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      mdsal-merge-{stream}
-    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-release-management
     jobs:
index 839f983c09563bf7e8cf45153e9e0b8f83bd92ba..b8d2090191971c65cc621d4adfb50456ec3fdd80 100644 (file)
@@ -20,9 +20,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 8c5aad9df3c8d0157d02eeb7e029b21f0625cef4..4a8004b2c41b6fd7b21625d30c7a4114ebf5b75a 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 7b1a5799feb04b74d2e34541ba226df6ad0a0f15..044500ff133a416c18ca07436aab81c295641808 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 3ea5e77adfdabc3200e936646cfa669b4a0be73e..91f89ef03e380a19dd5cd518e7bb0864f031c971 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index da45b1c4cf8393aab506872347443c9010a671f3..f16187477960c63039fa936c832b6d3f0b78fc2f 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index bf279e55b0c83d0c70ade996832a36c467329910..4c24fc9792947f6107e23078ef66aab5abbfe0f5 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 91cbfcea39ca3b1de34234e006186d910aa41510..4c8c6386f6c48a78c2561f999bd0928ceb71b71f 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 3ff6efb0ab0d6ce6adfa9bdad892326102aff6d0..41148d3d36107847d30dcd91e8b30ac4f9d46ef4 100644 (file)
@@ -24,9 +24,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index fef29c4cf1e87704dd2571d888e38a83cbf017ac..4b29eff720ebb5756afd2356533b02aa70cd3d92 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 7ed846e6886edda02dacb68661f42d5b0db00e3f..9ff94cc4cfdfa01fe9d5230fafac2c7835f2b61d 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 126207535da9cb07feebea4eaca9c328a0e9e6a9..5ea8e953701db9eb84bfb0e4d6ec578bc321dd59 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index c08b0e2ad5b801895c2b6de06162134fa74ec162..eec65ba65e235a7db020416012f6c929369bbea8 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
deleted file mode 100644 (file)
index 9a7b7e9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: controller-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: "controller"
-
-    stream:
-      - chlorine:
-          branch: "master"
-          java-version: "openjdk11"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "3.0.x"
-          java-version: "openjdk11"
-
-    feature:
-      - core:
-          csit-list: >
-            controller-csit-1node-akka1-all-{stream},
-            controller-csit-1node-rest-cars-perf-all-{stream},
-            controller-csit-3node-clustering-ask-all-{stream},
-            controller-csit-3node-clustering-tell-all-{stream}
index 3e4a6de67701b6bf5ee1ba3438fe7e27a0821e3f..318fd12c19069e34ed087b2b4bafed37c235b9bc 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 43809ca61d3d2a780d8a0dbfb5b6074c9469c6ce..c5458e0348cacafb33f261a12427b7a030c5035f 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 852efcddd7307734539ff183b4235b1af5b8854b..3b896884dd91771b3749bc57dd7c87f96ce47faa 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: daexim
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
-          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "daexim"
-    project-name: "daexim"
-    stream: silicon
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
index 8fcde1b05aac3f3fd6f02d862eebad7dcea98adc..c54c963a6a84e31cf8c2d52addb109d44fa5b73b 100644 (file)
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220101-060058.758"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20220401-060107.331"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511"
     openstack_system2_count: 0
     openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220201-180056.429"
-    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20211001-010151.446"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20211001-000220.740"
-    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220501-180100.971"
+    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220401-010109.230"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220401-000109.037"
+    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20210120-225008.045"
 
     # Default Robot framework options
     robot-options: ""
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/silicon
+    verify-branch: stable/phosphorus
     # Value for ODL_STREAM
-    verify-stream: silicon
+    verify-stream: phosphorus
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk11
 
     10-exclude-value: ""
 
     # Manual CSIT job lists used by sanity or periodic in nature.
-    csit-mri-list-silicon: >
-      aaa-csit-1node-authn-all-silicon,
-      controller-csit-1node-akka1-all-silicon,
-      controller-csit-1node-benchmark-all-silicon,
-      controller-csit-1node-rest-cars-perf-all-silicon,
-      controller-csit-3node-benchmark-all-silicon,
-      controller-csit-3node-clustering-ask-all-silicon,
-      controller-csit-3node-clustering-tell-all-silicon,
-      controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
-      mdsal-csit-3node-netty-replicate-only-silicon,
-      netconf-csit-1node-callhome-only-silicon,
-      netconf-csit-1node-scale-max-devices-only-silicon,
-      netconf-csit-1node-scale-only-silicon,
-      netconf-csit-1node-userfeatures-all-silicon,
-      netconf-csit-1node-userfeatures-rfc8040-all-silicon,
-      netconf-csit-3node-clustering-only-silicon,
-      netconf-csit-3node-clustering-scale-only-silicon,
-      yangtools-csit-1node-system-only-silicon
-    csit-sanity-list-silicon: >
-      openflowplugin-csit-1node-sanity-only-silicon,
-      distribution-sanity-silicon
-    csit-weekly-list-silicon: >
-      controller-csit-1node-notifications-longevity-only-silicon,
-      controller-csit-3node-drb-partnheal-longevity-only-silicon,
-      controller-csit-3node-drb-precedence-longevity-only-silicon,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon,
-      bgpcep-csit-3node-bgpclustering-longevity-only-silicon,
-      distribution-deploy-silicon,
-      distribution-offline-silicon,
-      openflowplugin-csit-1node-longevity-only-silicon
     csit-mri-list-phosphorus: >
       aaa-csit-1node-authn-all-phosphorus,
       controller-csit-1node-akka1-all-phosphorus,
       distribution-sanity-phosphorus
     csit-mri-list-sulfur: >
       aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur,
-      controller-csit-1node-benchmark-all-sulfur, controller-csit-1node-rest-cars-perf-all-sulfur,
+      controller-csit-1node-benchmark-all-sulfur,
+      controller-csit-1node-rest-cars-perf-all-sulfur,
       controller-csit-3node-benchmark-all-sulfur,
-      controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur,
+      controller-csit-3node-clustering-ask-all-sulfur,
+      controller-csit-3node-clustering-tell-all-sulfur,
       controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur,
       controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur,
-      mdsal-csit-3node-netty-replicate-only-sulfur, netconf-csit-1node-callhome-only-master,
-      netconf-csit-1node-scale-max-devices-only-master, netconf-csit-1node-scale-only-master,
-      netconf-csit-1node-userfeatures-all-master, netconf-csit-1node-userfeatures-rfc8040-all-master,
-      netconf-csit-3node-clustering-only-master, netconf-csit-3node-clustering-scale-only-master,
+      mdsal-csit-3node-netty-replicate-only-sulfur,
+      netconf-csit-1node-callhome-only-master,
+      netconf-csit-1node-scale-max-devices-only-master,
+      netconf-csit-1node-scale-only-master,
+      netconf-csit-1node-userfeatures-all-master,
+      netconf-csit-1node-userfeatures-rfc8040-all-master,
+      netconf-csit-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master,
       yangtools-csit-1node-system-only-sulfur
     csit-weekly-list-sulfur: >
       controller-csit-1node-notifications-longevity-only-sulfur,
       controller-csit-3node-drb-partnheal-longevity-only-sulfur,
       controller-csit-3node-drb-precedence-longevity-only-sulfur,
       controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur,
-      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur,
-      distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur
+      bgpcep-csit-3node-bgpclustering-longevity-only-sulfur,
+      distribution-deploy-sulfur,
+      distribution-offline-sulfur,
+      openflowplugin-csit-1node-longevity-only-sulfur
     csit-sanity-list-sulfur: >
-      openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur
+      openflowplugin-csit-1node-sanity-only-sulfur,
+      distribution-sanity-sulfur
     csit-mri-list-chlorine: >
-      aaa-csit-1node-authn-all-chlorine, controller-csit-1node-akka1-all-chlorine,
-      controller-csit-1node-benchmark-all-chlorine, controller-csit-1node-rest-cars-perf-all-chlorine,
-      controller-csit-3node-benchmark-all-chlorine, controller-csit-3node-clustering-ask-all-chlorine,
-      controller-csit-3node-clustering-tell-all-chlorine, controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, mdsal-csit-3node-netty-replicate-only-chlorine,
-      netconf-csit-1node-callhome-only-master, netconf-csit-1node-scale-max-devices-only-master,
-      netconf-csit-1node-scale-only-master, netconf-csit-1node-userfeatures-all-master,
-      netconf-csit-1node-userfeatures-rfc8040-all-master, netconf-csit-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master, yangtools-csit-1node-system-only-chlorine
+      aaa-csit-1node-authn-all-chlorine,
+      controller-csit-1node-akka1-all-chlorine,
+      controller-csit-1node-benchmark-all-chlorine,
+      controller-csit-1node-rest-cars-perf-all-chlorine,
+      controller-csit-3node-benchmark-all-chlorine,
+      controller-csit-3node-clustering-ask-all-chlorine,
+      controller-csit-3node-clustering-tell-all-chlorine,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine,
+      mdsal-csit-3node-netty-replicate-only-chlorine,
+      netconf-csit-1node-callhome-only-master,
+      netconf-csit-1node-scale-max-devices-only-master,
+      netconf-csit-1node-scale-only-master,
+      netconf-csit-1node-userfeatures-all-master,
+      netconf-csit-1node-userfeatures-rfc8040-all-master,
+      netconf-csit-3node-clustering-only-master,
+      netconf-csit-3node-clustering-scale-only-master,
+      yangtools-csit-1node-system-only-chlorine
     csit-weekly-list-chlorine: >
-      controller-csit-1node-notifications-longevity-only-chlorine, controller-csit-3node-drb-partnheal-longevity-only-chlorine,
-      controller-csit-3node-drb-precedence-longevity-only-chlorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine,
-      bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, distribution-deploy-chlorine,
-      distribution-offline-chlorine, openflowplugin-csit-1node-longevity-only-chlorine
+      controller-csit-1node-notifications-longevity-only-chlorine,
+      controller-csit-3node-drb-partnheal-longevity-only-chlorine,
+      controller-csit-3node-drb-precedence-longevity-only-chlorine,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine,
+      bgpcep-csit-3node-bgpclustering-longevity-only-chlorine,
+      distribution-deploy-chlorine,
+      distribution-offline-chlorine,
+      openflowplugin-csit-1node-longevity-only-chlorine
     csit-sanity-list-chlorine: >
-      openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine
+      openflowplugin-csit-1node-sanity-only-chlorine,
+      distribution-sanity-chlorine
index 40c3dad8af7c36f1c061018a90ed888ffc60d592..4b8628d5ea4e479685a830b92a603d71ce7a7703 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 440844c240501f778cdd5b89efdbf5d3e8497da5..03860324309ae9b22cea1f87bbf10f424327ace7 100644 (file)
@@ -12,8 +12,6 @@
           branch: "stable/sulfur"
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
 
     project: docs
     project-name: docs
index d0d42157bed6958e07e82b65482329bb5937cce2..85edb6d9f04184c99f1738c609fa133fb50ecf51 100644 (file)
@@ -29,7 +29,7 @@
           lftools-version: "{lftools-version}"
       - string:
           name: RELEASE_NAME
-          description: "The next release name eg: Silicon, Phosphorus."
+          description: "The next release name eg: Sulfur, Phosphorus."
       - bool:
           name: PUBLISH
           default: false
index fd9b06586644c99e1c26bdd74181d1364757f5fc..90021ed03ad428670b8c11b743e1521bb7b51b58 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
     echo ""
-    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Silicon, Phosphorus."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Sulfur, Phosphorus."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
@@ -36,11 +36,11 @@ pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade git-review
 git config --global --add gitreview.username "jenkins-$SILO"
 cd "$WORKSPACE"/docs || exit
-RELEASE_NAME=$RELEASE_NAME
+RELEASE_NAME=${RELEASE_NAME:-}
 Next_release="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}" # Captilize Version Name
 release_name=$STREAM
 Release_version="$(tr '[:lower:]' '[:upper:]' <<< "${release_name:0:1}")${release_name:1}" # Captilize Version Name
-PUBLISH=$PUBLISH
+PUBLISH=${PUBLISH:-}
 stable_release_str=stable-$release_name
 echo "Start Version Updating in docs project"
 echo "RELEASE_NAME : $Next_release"
index b92a648082b9ea0fb6f2dd7996015e6b0d721a5e..31cb15994bb7b9a2270e840df0d2237b3f7f3f4e 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <release_name> <PUBLISH>"
     echo ""
-    echo "    release_name:  The release_name e.g Silicon, Phosphorus."
+    echo "    release_name:  The release_name e.g Sulfur, Phosphorus."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
@@ -39,7 +39,7 @@ cd "$WORKSPACE"/autorelease || exit
 GERRIT_PROJECT="releng/autorelease"
 if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then
     # User input
-    RELEASE_NAME=$RELEASE_NAME
+    RELEASE_NAME=${RELEASE_NAME:-}
     # Captilize Version Name
     release_name="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}"
     echo "Start Version Updating in odl-projects"
diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
deleted file mode 100644 (file)
index 6e3f8f5..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: genius-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: "genius"
-
-    stream:
-      - master:
-          branch: "master"
-          java-version: "openjdk11"
-
-    os-branch: "rocky"
-
-    feature:
-      - netvirt:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
-      - cluster-netvirt:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-
-      - netvirt-itm-direct-tunnels:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
-
-      - genius:
-          csit-list: >
-            genius-csit-1node-gate-only-{stream}
-
-      - cluster:
-          csit-list: >
-            genius-csit-3node-gate-only-{stream}
-
-      - tdd-wip:
-          csit-list: >
-            genius-csit-1node-tdd-wip-only-{stream}
index d604430b77aea3805e6db5c55a71fb1b01ddd933..4111328510dd2d2702c72b9910c88cfd87bdd890 100644 (file)
@@ -8,15 +8,14 @@
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     stream: master
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "infrautils-settings"
     build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream}"
@@ -26,7 +25,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-2.0.x
+    name: infrautils-3.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+        build-node: centos8-builder-4c-4g
 
-    stream: 2.0.x
+    stream: 3.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "2.0.x"
+    branch: 3.0.x
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
     dependencies: "odlparent-merge-{stream}"
@@ -50,7 +51,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.9.x
+    name: infrautils-2.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: 1.9.x
+    stream: 2.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.9.x"
+    branch: "2.0.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
     dependencies: "odlparent-merge-{stream}"
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
+    build-node: centos8-builder-4c-4g
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"
index df9892a308a6e8a661874e5a44411f8b9ac69843..1436d8a1973f8904d8936a17a0e3e78119d9a5e0 100644 (file)
@@ -4,7 +4,6 @@ bgpcep-csit-1node-throughpcep-all-chlorine,
 bgpcep-csit-1node-userfeatures-all-chlorine,
 daexim-csit-1node-basic-only-chlorine,
 daexim-csit-3node-clustering-basic-only-chlorine,
-distribution-csit-managed-chlorine,
 jsonrpc-csit-1node-basic-only-chlorine,
 odltools-csit-1node-upstream-all-chlorine,
 openflowplugin-csit-1node-cbench-only-chlorine,
diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst
deleted file mode 100644 (file)
index 64d9502..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-bgpcep-csit-1node-bgp-ingest-all-silicon,
-bgpcep-csit-1node-bgp-ingest-mixed-all-silicon,
-bgpcep-csit-1node-throughpcep-all-silicon,
-bgpcep-csit-1node-userfeatures-all-silicon,
-daexim-csit-1node-basic-only-silicon,
-daexim-csit-3node-clustering-basic-only-silicon,
-distribution-csit-1node-userfeatures-all-silicon,
-distribution-csit-managed-silicon,
-jsonrpc-csit-1node-basic-only-silicon,
-odltools-csit-1node-upstream-all-silicon,
-openflowplugin-csit-1node-cbench-only-silicon,
-openflowplugin-csit-1node-flow-services-all-silicon,
-openflowplugin-csit-1node-perf-bulkomatic-only-silicon,
-openflowplugin-csit-1node-perf-stats-collection-only-silicon,
-openflowplugin-csit-1node-scale-link-only-silicon,
-openflowplugin-csit-1node-scale-only-silicon,
-openflowplugin-csit-1node-scale-switch-only-silicon,
-openflowplugin-csit-3node-clustering-bulkomatic-only-silicon,
-openflowplugin-csit-3node-clustering-only-silicon,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-silicon,
-ovsdb-csit-1node-upstream-southbound-all-silicon,
-ovsdb-csit-3node-upstream-clustering-only-silicon,
index 19f56c546723dd7af719284ef012f2780e286a3d..5b0d208a0862ed018645a845d165d8cee1db5d3e 100644 (file)
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
+          mvn-version: mvn35
 
 - project:
     name: distribution-managed
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: mvn35
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          mvn-version: mvn35
           dependencies: >
             distribution-merge-managed-{stream},
 
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - sulfur:
+      - chlorine:
           branch: "master"
+          mvn-version: mvn38
+      - sulfur:
+          branch: "stable/sulfur"
+          mvn-version: mvn38
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
+          mvn-version: mvn35
 
 - project:
     name: distribution-sonar
index e6d4accedb8c9e9657218bf6b51adcd5834f4cb8..98538816e619258c165b4aa5c79480be3638cbd8 100644 (file)
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn38
+          maven-version: "{mvn-version}"
           pom: pom.xml
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
       - maven-exec:
-          maven-version: mvn38
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
index 4e90f52cc8bec315e427ee744a54e3f2b318dedc..8bc06a78213efd016385d32f0ef2917b665fed61 100644 (file)
           default: "all"
           description: "Specific feature test for patch"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: "{project}/pom.xml"
           goals: |
             clean install dependency:tree
           default: "all"
           description: "Specific feature test for patch"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: "{project}/pom.xml"
           goals: |
             clean install dependency:tree
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: distribution/pom.xml
           goals: |
             clean install dependency:tree
index b8996c1024952a22a22089a5a00052d25d9c5a30..1bebf9bef8cc3beabcbafe01726b137f3d18bdc8 100644 (file)
     stream:
       - chlorine:
           branch: "master"
-          mvn-version: "mvn35"
+          mvn-version: "mvn38"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-chlorine.lst
           build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
 
       - sulfur:
           branch: "stable/sulfur"
-          mvn-version: "mvn35"
+          mvn-version: "mvn38"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-sulfur.lst
           build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
 
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-phosphorus.lst
           build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
-
-      - silicon:
-          branch: "stable/silicon"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-silicon.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
-            bgpcep integration/distribution
+            odlparent infrautils yangtools mdsal controller aaa netconf bgpcep
+            serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping
+            integration/distribution
 
 - project:
     name: integration-distribution
@@ -74,8 +64,8 @@
       - chlorine:
           branch: "master"
           csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
@@ -87,8 +77,8 @@
       - sulfur:
           branch: "stable/sulfur"
           csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
       - phosphorus:
           branch: "stable/phosphorus"
           csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            aaa controller dluxapps genius lispflowmapping l2switch mdsal
+            netconf netvirt odlmicro sxp yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
           csit-list: !include: csit-jobs-phosphorus.lst
           csit-mri-list: "{csit-mri-list-phosphorus}"
           csit-weekly-list: "{csit-weekly-list-phosphorus}"
-      - silicon:
-          branch: "stable/silicon"
-          csit-blocklist: >
-            aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo
-            netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
-            gate longevity sanity tdd tempest wip
-            bgpcep-csit-3node-bgpclustering-all
-            bgpcep-csit-3node-bgpclustering-ha-only
-            openflowplugin-csit-1node-bundle-based-reconciliation
-            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
-          csit-list: !include: csit-jobs-silicon.lst
-          csit-mri-list: "{csit-mri-list-silicon}"
-          csit-weekly-list: "{csit-weekly-list-silicon}"
 
 - project:
     name: integration-sanity
           branch: "stable/phosphorus"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-phosphorus}"
-      - silicon:
-          branch: "stable/silicon"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-silicon}"
 
 - job-template:
     name: "integration-merge-dashboard"
       - integration-distribution-git-url:
           git-url: "{git-url}"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: "mvn35"
+          maven-version: "{mvn-version}"
           pom: "$GERRIT_PROJECT/pom.xml"
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: distribution/pom.xml
           goals: |
             clean install dependency:tree -DoutputFile=dependency_tree.txt
       - lf-infra-maven-parameters:
           mvn-opts: ""
           mvn-params: ""
-          mvn-version: mvn35
+          mvn-version: "{mvn-version}"
           staging-profile-id: "" # Staging repos do not make sense for this job
 
     wrappers:
index 255f50984a93bb764942f27de6a008773e20db8d..01ecb715a1662854b3dfea9b9e742b49c2512df8 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 1f5bb68d6c8899493ab08ee66a8d91edddce48b9..454d692edbd164ed4991caea135dc9bff7b7c351 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: jsonrpc
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
-          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "jsonrpc"
-    project-name: "jsonrpc"
-    stream: silicon
-    java-version: "openjdk11"
-    branch: "stable/silicon"
-    mvn-settings: "jsonrpc-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
-    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-release-management
     jobs:
index 9278dc4552a6f40f093c160f8685582b433c852a..4348b0ac560b1887a829b0f4489a4622a0368cf0 100644 (file)
@@ -22,9 +22,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index fc4d46fc7b7462788588eae415d3ca0d675ec76a..798a2a85029e1fa6ce6da3acbd60372e6eef2510 100644 (file)
@@ -22,9 +22,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 3bc53753fa154977f86a438a296fc4cf2f028fac..5cd7cab1f1fb357108b7255b40a31d2e7ae42b0e 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
deleted file mode 100644 (file)
index 160824f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: l2switch-patch-test
-    jobs:
-      - inttest-patch-test
-
-    # The project name
-    project: "l2switch"
-    disable-job: true
-
-    # Project branches
-    stream:
-      - chlorine:
-          branch: "master"
-          jre: "openjdk11"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
-    os-branch: "queens"
-
-    feature:
-      - all:
-          csit-list: >
-            l2switch-csit-1node--host-scalability-daily-only-{stream},
-            l2switch-csit-1node-scalability-all-{stream},
-            l2switch-csit-1node-switch-all-{stream}
index e8a948b6b5af4d27323d5cd83514f78542864564..4c3f2ecb587bc4a898a104e4ae141bedf981970c 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index eeb872db46e971ff7503914a05289e315b58784d..b8e31e2514ac19abae3cf1f986f1592502b9a714 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: lispflowmapping
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
-          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "lispflowmapping"
-    project-name: "lispflowmapping"
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "lispflowmapping-settings"
-    mvn-goals: "clean deploy -DrepoBuild"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
-    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"
-    archive-artifacts: >
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index 7022d10a64e090e7024a8f94777376ee8a497d57..425bf57c146c74b8580a3ab21215139d75ee5d21 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 1d010e2562e003523d2dac8e6426f61fc2e43f45..fedca236f493d37147d197bceb04299be6d732e1 100644 (file)
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          install-features: >
-            features-controller,
-            odl-mdsal-exp-replicate-netty,
-            odl-restconf-nb-bierman02,
-            odl-netconf-clustered-topology,
-            odl-clustering-test-app
 
     install:
       - only:
index aa4f502dc1d4c3551b742d0cb9f6115f5ae9cd20..5e8a359d2dba2b676d3057370fcb491faf17adbc 100644 (file)
@@ -15,9 +15,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index 2c2fd9bbcd9a88ac741c7ccecc344424feaf8ded..cb0edd4b43d890b15d38e4e5dc7eac3ab09f3a9d 100644 (file)
@@ -15,9 +15,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index 66dfd632c9fbd5cf60afdcba093dc22ff2c99c35..2f250fc59bd9c4b7992bda668dea4a9db3bc175b 100644 (file)
@@ -17,9 +17,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
@@ -28,7 +25,7 @@
           scope: "only"
 
     # no mininet required
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357"
 
     # Features to install
     install-features: "odl-netconf-callhome-ssh,odl-restconf"
index 016cf13c1a58e865ad17dad919cd2732b94e30fb..184782d48b69257d14abba997631b5daaf2fd431 100644 (file)
@@ -10,9 +10,6 @@
       - master:
           branch: "master"
           java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
deleted file mode 100644 (file)
index 1b8bdc6..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- project:
-    name: netconf-patch-test
-    jobs:
-      - inttest-mri-patch-test
-
-    project: "netconf"
-
-    stream:
-      - master:
-          branch: "master"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
-
-    os-branch: "queens"
-
-    karaf-version: netconf
-
-    feature:
-      - core:
-          csit-list: >
-            netconf-csit-1node-gate-userfeatures-all-{stream},
-            netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream},
-            netconf-csit-1node-gate-callhome-only-{stream}
index fb554abcb2e84c4d00de1a6de5e98be8f5a543e5..15d861ced5f6798f1577ef8fec2fe94c46dd7c74 100644 (file)
@@ -15,9 +15,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
-            \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
-            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
 
     karaf-version: netconf
 
index c4c9117c9de06477d89498bb67ad4023f29b0b07..652177997a1e7ec38382388a02a9de6af65f80f8 100644 (file)
@@ -21,9 +21,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
@@ -31,7 +28,7 @@
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220501-040104.357"
 
     # Features to install
     install-features: >
diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
deleted file mode 100644 (file)
index bbd0755..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: netvirt-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: "netvirt"
-
-    stream:
-      - master:
-          branch: "master"
-          java-version: "openjdk11"
-
-    os-branch: "rocky"
-
-    jdk: "openjdk8"
-
-    feature:
-      - current:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-      - cluster-current:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-      - cluster-minimal-current:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream}
-      - snat-conntrack:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
-      - cluster-snat-conntrack:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
-      - l2gw:
-          csit-list: >
-            netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
-      - tdd-wip:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
-      - itm-direct-tunnels:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
-      - upgrade:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream}
-      - tempest:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
-      - cluster-tempest:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
-      - tempest-snat-conntrack:
-          csit-list: >
-            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
-      - cluster-tempest-snat-conntrack:
-          csit-list: >
-            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
index 007a6cd01f611006b621e01794e5fdbad1d6b057..3420347be908c18fc73d05f2ee3c7fdf5ff81ae9 100644 (file)
@@ -9,12 +9,13 @@
     stream:
       - chlorine:
           branch: "master"
+          mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"
+          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
+          mvn-version: "mvn35"
 
     os-branch: "queens"
 
index 6f5e657ce32c7884eda44cc06be46dced960f2e6..1c4fdb1b1c238026de6e754ac57f1b4956c6210e 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "neutron-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
-    email-upstream: "[neutron] [odlparent] [aaa]"
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index a00459017f87900efd0365e56cf3af8bf8a93f79..ea1ed1ca1384d11874619baf0bf20e9b8b139df7 100644 (file)
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
             -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          functionality: "netconf"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
 
     install:
       - manual:
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          functionality: "netconf-devices-scale"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-            -v USE_NETCONF_CONNECTOR:False
-            -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:400
-            -v SCALE_TESTS:TRUE
     install:
       - manual:
           scope: "test"
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          functionality: "netconf-general-scale"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-            -v USE_NETCONF_CONNECTOR:False
-            -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:400
-            -v SCALE_TESTS:TRUE
     install:
       - manual:
           scope: "test"
index 41652984722cce1e378042fbf3654a1468d1e5f7..810c47bc384cd9b641c2098a69fd13d3ff17ebc6 100644 (file)
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
-- project:
-    name: odlmicro-silicon
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: odlmicro
-    project-name: "odlmicro"
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    build-node: centos7-builder-2c-2g
-    build-timeout: 60
-    mvn-settings: "odlmicro-settings"
-    mvn-opts: "-Xmx2048m"
-
-    # Used by the release job
-    staging-profile-id: 44ce67428fd0d
-
 - project:
     name: odlmicro-release-management
     jobs:
index ccf54e2a470285288b8cd0f9752d2139f66312e0..0cf1f23918490ab02b907cd9884ca4496e824a1a 100644 (file)
@@ -44,7 +44,8 @@
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17:
+        build-node: centos8-builder-4c-4g
       - gerrit-tox-verify
 
     project: odlparent
@@ -53,8 +54,6 @@
     branch: 10.0.x
 
     mvn-settings: odlparent-settings
-    build-node: centos8-builder-4c-4g
-
     dependencies: ""
     email-upstream: "[odlparent]"
     archive-artifacts: >
index e4bbab9983ec1c6daa7cc5478ad0e77c0bcdd4a0..ca2bb733e5829cb8fa8e7e9142ec6e5ba9372f26 100644 (file)
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
-- project:
-    name: odlsaf-silicon
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "odlsaf"
-    project-name: "odlsaf"
-    build-node: centos7-builder-4c-4g
-    build-timeout: 120
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "odlsaf-settings"
-    mvn-opts: "-Xmx2048m"
-    email-upstream: "[app-dev]"
-
-    # Used by the release job
-    staging-profile-id: 2802f0e38ee665
-
 - project:
     name: odlsaf-release-management
     jobs:
index be4537a0f4c764b21be37013b399ee16355a4feb..48090e8233f3957b45d4506daed899f0e07b11db 100644 (file)
@@ -19,9 +19,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     functionality:
       - "upstream"
diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
deleted file mode 100644 (file)
index 18a1d92..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- project:
-    name: odltools-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: odltools
-    jdk: openjdk8
-
-    stream:
-      - chlorine:
-          branch: "master"
-      - sulfur:
-          branch: "stable/sulfur"
-      - phosphorus:
-          branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
-
-    feature:
-      - current:
-          csit-list: >
-            odltools-csit-1node-gate-all-{stream}
index 4e4c3f9620559800cae31c0341559bdeac92333c..59ef495846514041919096ef6fd6fdb77d64d4ec 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index dda4a02384bf9bd7a9174d8a0c569bc75e9c876b..6b0223f6696f9047f0c2461a7718085f7e950575 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 007d66ab86869fa0e7040533c82c45c04abacaf1..b5c808d9f90666e48aad637244fb669f9925aec4 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 55d1a853cf3895e474e79c5524b6b64bdbec97b2..4ffa70b14e4e7fc5df601a4b40c9a79cf2daea1d 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index e1d5b0bdf78a90d632d95a36714723e3eec34c21..1f08793a9b32815b41b9a77ac4c58a52b0c0ea96 100644 (file)
           branch: "stable/phosphorus"
           jre: "openjdk11"
           install: "all"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-          install: "all"
 
     # Features to install
     install-features: >
index f558837c6a5a8f59e4a5351e99f4e1b9960fb7b8..63578421c9197814eaf1601a78b98f91540d5613 100644 (file)
@@ -25,9 +25,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index dfe8d352e48e73899ccf47df6423b9d5134bf7e0..54a7e24b53d0f96fbd1f0e6580515868b1d8d7a7 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 6a26aef3236604c898645b960cde5227323ee296..3ee8471d948581c286c60e242f3a69dec09476aa 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 048da88552afa6905cdb666f87d01eabc0119066..407e44aec4403645f90953f155cad938011da62a 100644 (file)
@@ -22,9 +22,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 4eac308409d446a1369cd4c361a0f52ff71ea5a0..2f44fe626bd543c55566f0831fc5786ae738cea9 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 4ff61cf595e9c92932c6d252db7081cdadd78b01..2f5d49cced064ca34d6cb083e61db11dd0708c55 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 8f90fc716b557e1f4583142534890ed239e55c9c..aead9a5c423f94b4536bcd5bcdb780a02335f765 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index 8aafddc1aad2e4e352059c8d03f541e7f7ae4db2..09f93f246b3250e75f50eb9257134d9ae1cfccd3 100644 (file)
       - chlorine:
           branch: "master"
           java-version: "openjdk11"
+          mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
+          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
+          mvn-version: "mvn35"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 450053d5814722ced1b90a06caa2916d52620e07..d606e8fa5088c1e6648b90b02895551bf6c94384 100644 (file)
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: openflowplugin
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
-          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    java-version: "openjdk11"
-    mvn-settings: "openflowplugin-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      openflowjava-merge-{stream}
-    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
 - project:
     name: openflowplugin-sonar
     jobs:
index 80764c501a3bf60be5a27baeb88422f0c8d8ec37..2dc384c3120956ad3f0b0f4fcc11db78f8b19cb9 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
index f0b2e71b657fc86eeb7d9b43d3a039305c50341e..14102449fdddc4e9f9546e3a19b8baaf3180d01d 100644 (file)
@@ -23,9 +23,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index 6c9c8213d4eaec3ba75e36fd8464e4f1cc2d5ce1..d525cf45bb9a3816763da56e6f101ac8e9111f31 100644 (file)
@@ -14,9 +14,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
 
     project: "ovsdb"
     archive-artifacts: "*.log"
index c331a9107c09fe54f9284de4a17efbca9a87dc9f..fa59baa411cc1e6da822fbad111feb5776bb91c4 100644 (file)
       - chlorine:
           branch: "master"
           java-version: "openjdk11"
+          mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
+          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
           java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
+          mvn-version: "mvn35"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 58709ec7301c7829f7828ef33cb8a34950615999..c5d4978cc95e007f41a7b2b67531249d1759737a 100644 (file)
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: ovsdb
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
-          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "ovsdb"
-    project-name: "ovsdb"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    mvn-settings: "ovsdb-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
-
 - project:
     name: ovsdb-sonar
     jobs:
index 3d984b3d81796402705aa9b438c60992813ed428..bc7f7727373d20307d302bfb0679ec96102cbdb8 100644 (file)
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
-- project:
-    name: p4plugin-silicon
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "p4plugin"
-    project-name: "p4plugin"
-    branch: "stable/silicon"
-    mvn-settings: "p4plugin-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: ""
-    email-upstream: "[p4plugin]"
-
-    # Used by the release job
-    staging-profile-id: a68bf26e208d4
-
 - project:
     name: p4plugin-release-management
     jobs:
index bd62aeee06229d97eaa6a83f2c537ee1a526587c..5726b36d68c538e050fa350257246770614ef810 100644 (file)
       helm3.7 package .
 
     stream:
-      - "master":
-          branch: "sulfur"
+      - chlorine:
+          branch: "master"
+      - sulfur:
+          branch: "stable/sulfur"
       - phosphorus:
           branch: stable/phosphorus
-      - silicon:
-          branch: stable/silicon
 
     helm_bin:
       - helm3.7
index 64b9fce3149d52ad6eb832bafc2ac5e442652ec8..7c8a2b45afa66b7c0253c343545c285a9ec4d1a6 100644 (file)
@@ -19,8 +19,6 @@
     stream:
       - phosphorus:
           branch: stable/phosphorus
-      - silicon:
-          branch: stable/silicon
 
 - project:
     name: packaging-release
index 1d241209d0c9f6e9eaa68111bc6a13b237a6fc5c..1d1977e9bd86734d3542ead109d070bdb42610e3 100644 (file)
@@ -9,12 +9,13 @@
     stream:
       - chlorine:
           branch: "master"
+          mvn-version: "mvn38"
       - sulfur:
           branch: "stable/sulfur"
+          mvn-version: "mvn38"
       - phosphorus:
           branch: "stable/phosphorus"
-      - silicon:
-          branch: "stable/silicon"
+          mvn-version: "mvn35"
 
     os-branch: "queens"
     jdk: "openjdk8"
index aad9dfb5472dd7ad81eb41f62bdf6b37fe4d235c..764cb924b1a00abc47c635433729e1f5be20a8bb 100644 (file)
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: serviceutils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
-          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    branch: "stable/silicon"
-    stream: silicon
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
-    mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      infrautils-merge-{stream}
-    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
-
 - project:
     name: serviceutils-sonar
     jobs:
index 5d3102063f765a9488ef6f93f30cd36bbdc4cec8..75f6285d6951fd851f3da96f19c6e96dda32d634 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - all:
index eec62f779fef85301c7751cd67c4e498a8f1bbab..8da195a5403377d0828cc1c2de389cdbfa6035d9 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-silicon
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: transportpce
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
-          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
-      - gerrit-tox-verify:
-          build-timeout: 240
-          build-node: centos7-builder-4c-16g
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: silicon
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "transportpce-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-release-management
     jobs:
index 78549965e2f8bd64bdb4ba8aa4c350c0a100361c..7b3e3140d60b0fc46617009ca5a4324f36f76a0f 100644 (file)
@@ -21,9 +21,6 @@
       - phosphorus:
           branch: "stable/phosphorus"
           jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
 
     install:
       - only:
diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
deleted file mode 100644 (file)
index c595325..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- project:
-    name: yangtools-patch-test
-    jobs:
-      - inttest-patch-test
-
-    project: "yangtools"
-
-    stream:
-      - chlorine:
-          branch: "master"
-          jre: "openjdk11"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-      - silicon:
-          branch: "6.0.x"
-          jre: "openjdk11"
-
-    feature:
-      - core:
-          csit-list: >
-            yangtools-csit-1node-system-only-{stream}
index ece84352b2b4d60f5b030740d763ba209ca0dc30..57a731be5982f93c1b6ef23febd3c95f48f0f154 100644 (file)
     project: "yangtools"
     project-name: "yangtools"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"
index 88cf3cb97817b6574da19dbac5655177d6fc95ff..553dd83bfe432b2e97f7541b5dc3c2b2d9a85a30 100755 (executable)
@@ -47,7 +47,7 @@ def create_and_update_project_jobs(
 
     Only updates projects where the top project configuration has a name that
     is equivalent to the current release. For example project name
-    "aaa-silicon" would have a release that matches what was passed to
+    "aaa-sulfur" would have a release that matches what was passed to
     release_on_stable_branch.
     """
     for directory in filter(
@@ -101,7 +101,7 @@ def update_job_streams(release_on_stable_branch, release_on_current_branch, job_
     are handled by other functions in this script.
 
     Only updates projects where the top stream in the list is equivalent to the
-    current release. For example stream "silicon" would have a release that
+    current release. For example stream "sulfur" would have a release that
     matches what was passed to release_on_stable_branch.
     """
     for directory in filter(
@@ -328,7 +328,7 @@ def update_integration_csit_list(
 parser = argparse.ArgumentParser(
     description="""Creates & updates jobs for ODL projects when branch cutting.
 
-    Example usage: python scripts/cut-branch.sh Silicon Phosphorus jjb/
+    Example usage: python scripts/cut-branch.sh Phosphorus Sulfur jjb/
 
     ** If calling from tox the JOD_DIR is auto-detected so only pass the current
     and next release stream name. **
@@ -346,7 +346,7 @@ parser.add_argument(
     metavar="RELEASE_ON_CURRENT_BRANCH",
     type=str,
     help="""The ODL release codename for the new {}
-        (eg. Silicon, Phosphorus).""".format(
+        (eg. Sulfur, Phosphorus).""".format(
         default_branch
     ),
 )