Merge "Feat: Branch cut stable/scandium"

opendaylight · Aug 26, 2024 · 6460887 · 6460887
2 parents 07839d7 + 428fa6e
commit 6460887
Show file tree

Hide file tree

Showing 68 changed files with 536 additions and 125 deletions.
diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
@@ -14,8 +14,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml
@@ -88,8 +88,10 @@
     jobs:
       - "{project-name}-gerrit-branch-lock-{stream}"
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
@@ -9,8 +9,10 @@
       - gerrit-tox-verify
 
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:
@@ -29,15 +31,19 @@
     jobs:
       - "autorelease-release-{stream}-{mvn-version}-{java-version}":
           build-node: ubuntu2004-docker-8c-8g
-      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}":
-          build-node: centos8-builder-2c-8g
+      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
       - "autorelease-generate-release-notes-{stream}"
 
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
           java-version: openjdk21
           mvn-version: mvn39
+          integration-test: titanium
+      - scandium:
+          branch: "stable/scandium"
+          java-version: openjdk21
+          mvn-version: mvn39
           integration-test: scandium
       - calcium:
           branch: "stable/calcium"

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
@@ -11,8 +11,10 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -14,8 +14,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
@@ -12,8 +12,10 @@
     functionality: "akka1"
 
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
@@ -13,8 +13,10 @@
     elasticsearch-attribute: "disabled"
 
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -16,8 +16,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -15,8 +15,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - scandium:
+      - titanium:
           branch: "master"
+      - scandium:
+          branch: "stable/scandium"
       - calcium:
           branch: "stable/calcium"
       - potassium:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: daexim-titanium
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - distribution-check-jobs-jdk21
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
+
+    project: "daexim"
+    project-name: "daexim"
+    stream: titanium
+    branch: "master"
+    build-node: ubuntu2004-docker-4c-4g
+    mvn-settings: "daexim-settings"
+    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-scandium
     jobs:
@@ -14,7 +38,7 @@
     project: "daexim"
     project-name: "daexim"
     stream: scandium
-    branch: "master"
+    branch: "stable/scandium"
     build-node: ubuntu2004-docker-4c-4g
     mvn-settings: "daexim-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
@@ -296,4 +296,33 @@
       bgpcep-csit-3node-bgpclustering-longevity-only-scandium,
       openflowplugin-csit-1node-longevity-only-scandium
     csit-sanity-list-scandium: >
-      openflowplugin-csit-1node-sanity-only-scandium, distribution-sanity-scandium
+      openflowplugin-csit-1node-sanity-only-scandium,
+      distribution-sanity-scandium
+    csit-mri-list-titanium: >
+      aaa-csit-1node-authn-all-titanium,
+      controller-csit-1node-akka1-all-titanium,
+      controller-csit-1node-benchmark-all-titanium,
+      controller-csit-1node-rest-cars-perf-all-titanium,
+      controller-csit-3node-benchmark-all-titanium,
+      controller-csit-3node-clustering-ask-all-titanium,
+      controller-csit-3node-clustering-tell-all-titanium,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-titanium,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-titanium,
+      mdsal-csit-3node-netty-replicate-only-titanium,
+      netconf-csit-1node-callhome-only-titanium,
+      netconf-csit-1node-scale-max-devices-only-titanium,
+      netconf-csit-1node-scale-only-titanium,
+      netconf-csit-1node-userfeatures-all-titanium,
+      netconf-csit-3node-clustering-only-titanium,
+      netconf-csit-3node-clustering-scale-only-titanium,
+      yangtools-csit-1node-system-only-titanium
+    csit-weekly-list-titanium: >
+      controller-csit-1node-notifications-longevity-only-titanium,
+      controller-csit-3node-drb-partnheal-longevity-only-titanium,
+      controller-csit-3node-drb-precedence-longevity-only-titanium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-titanium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-titanium,
+      openflowplugin-csit-1node-longevity-only-titanium
+    csit-sanity-list-titanium: >
+      openflowplugin-csit-1node-sanity-only-titanium,
+      distribution-sanity-titanium