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 51b0395bcd3880b36c51ef4e2f54f2987ad75d08..32830d9861c07f3e49961997c154eb2932887993 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -26,15 +26,13 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: openjdk11
-      - phosphorus:
-          branch: "stable/phosphorus"
-          mvn-version: mvn35
-          java-version: openjdk11
 
 - project:
     name: distribution-managed
@@ -62,7 +60,7 @@
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             daexim-maven-merge-{stream},
@@ -71,9 +69,8 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
@@ -81,9 +78,8 @@
             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},
@@ -116,18 +112,16 @@
     karaf-version: odl
     dist-pom: "distribution/opendaylight/pom.xml"
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
+      - 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},
@@ -136,8 +130,8 @@
     name: distribution-release
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-      - gerrit-release-merge
 
     project: "integration/distribution"
     project-name: "distribution"
@@ -154,15 +148,25 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - chlorine:
+      - argon:
           branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
       - sulfur:
           branch: "stable/sulfur"
           java-version: "openjdk11"
-      - 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
@@ -201,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