Fix: Fix int/dist stable/calcium jobs

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 654a375c5cd6d97723f87b9e88d82531765aebc2..b44fb0b28e4382e819f3e9b1d7eb3bee41bc66b9 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -18,19 +18,18 @@
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
     mvn-version: mvn38
-    java-version: openjdk17
     jre: "openjdk17"
     karaf-version: odl
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - potassium:
+      - scandium:
           branch: "master"
-      - argon:
-          branch: "stable/argon"
-      - chlorine:
-          branch: "stable/chlorine"
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
     name: distribution-managed
@@ -50,58 +49,37 @@
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
-    forbidden-files: '(docker\/.*)'
-    java-version: "openjdk17"
+    forbidden-files: '(docker\/.*|releases\/.*)'
     jre: "openjdk17"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
+    dependencies: >
+      daexim-maven-merge-{stream},
+      jsonrpc-maven-merge-{stream},
+      lispflowmapping-maven-merge-{stream},
+      openflowplugin-maven-merge-{stream},
+      ovsdb-maven-merge-{stream},
+      serviceutils-maven-merge-{stream},
 
     stream:
-      - potassium:
+      - scandium:
           branch: "master"
-          dependencies: >
-            daexim-maven-merge-{stream},
-            jsonrpc-maven-merge-{stream},
-            lispflowmapping-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
-      - argon:
-          branch: "stable/argon"
-          dependencies: >
-            daexim-maven-merge-{stream},
-            jsonrpc-maven-merge-{stream},
-            lispflowmapping-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
-      - chlorine:
-          branch: "stable/chlorine"
-          dependencies: >
-            daexim-maven-merge-{stream},
-            jsonrpc-maven-merge-{stream},
-            lispflowmapping-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
     name: distribution-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
     project: integration/distribution
     project-name: distribution
     branch: master
-    java-version: "openjdk17"
-    mvn-version: mvn38
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: "-Xmx1024m"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: distribution-docker
@@ -121,12 +99,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - potassium:
+      - scandium:
           branch: "master"
-      - argon:
-          branch: "stable/argon"
-      - chlorine:
-          branch: "stable/chlorine"
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
     name: distribution-docker-release