CI: Remove stable/phosphorus 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 2e860e510df846a76e4ce978ae8f516c256ca801..32830d9861c07f3e49961997c154eb2932887993 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -14,25 +14,25 @@
 
     project: integration/distribution
     project-name: distribution
+    build-node: centos8-builder-4c-4g
     mvn-settings: integration-distribution-settings
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
-    java-version: openjdk11
-    jre: "openjdk11"
+    mvn-version: mvn38
+    java-version: openjdk17
+    jre: "openjdk17"
     karaf-version: odl
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          mvn-version: mvn38
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
-          mvn-version: mvn38
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: mvn35
+          java-version: openjdk11
 
 - project:
     name: distribution-managed
@@ -45,22 +45,23 @@
 
     project: integration/distribution
     project-name: distribution
+    build-node: centos8-builder-4c-4g
     mvn-settings: integration-distribution-settings
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
+    mvn-version: mvn38
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
     forbidden-files: '(opendaylight\/.*|docker\/.*)'
-    java-version: "openjdk11"
-    jre: "openjdk11"
+    java-version: "openjdk17"
+    jre: "openjdk17"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          mvn-version: mvn38
           dependencies: >
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
@@ -68,9 +69,8 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          mvn-version: mvn38
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
@@ -78,9 +78,9 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: mvn35
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
           dependencies: >
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
@@ -99,30 +99,30 @@
 
     project: integration/distribution
     project-name: distribution
+    build-node: centos8-builder-4c-4g
     mvn-settings: integration-distribution-settings
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
+    mvn-version: mvn38
     email-upstream: "[int/dist]"
     type: full
     profile: "-Punmanaged"
     files: "opendaylight/**"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          mvn-version: mvn38
           dependencies: >
             distribution-merge-managed-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          mvn-version: mvn38
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
             distribution-merge-managed-{stream},
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: mvn35
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -130,31 +130,43 @@
     name: distribution-release
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-      - gerrit-release-merge
 
     project: "integration/distribution"
     project-name: "distribution"
+    build-node: centos8-builder-4c-4g
     use-release-file: false
     mvn-goals: "clean deploy -f opendaylight/pom.xml"
     mvn-settings: "integration-distribution-settings"
     mvn-opts: "-Xmx1024m"
-    java-version: "openjdk11"
+    mvn-version: mvn38
+    java-version: "openjdk17"
     email-upstream: "[int/dist]"
 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
-          mvn-version: mvn38
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
-          mvn-version: mvn38
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: mvn35
+          java-version: "openjdk11"
+
+- project:
+    name: distribution-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: "integration/distribution"
+    project-name: distribution
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: integration-distribution-settings
+    build-timeout: 60
 
 - project:
     name: distribution-sonar
@@ -163,8 +175,9 @@
 
     project: integration/distribution
     project-name: distribution
+    build-node: centos8-builder-4c-4g
     branch: master
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -192,12 +205,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
-      - phosphorus:
-          branch: "stable/phosphorus"
 
 - project:
     name: distribution-docker-release