Feat: switch default build-node to centos8-4c-4g

[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 32830d9861c07f3e49961997c154eb2932887993..654a375c5cd6d97723f87b9e88d82531765aebc2 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -14,7 +14,6 @@
 
     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"
@@ -26,13 +25,12 @@
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: openjdk11
 
 - project:
     name: distribution-managed
@@ -45,7 +43,6 @@
 
     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"
@@ -53,14 +50,14 @@
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
-    forbidden-files: '(opendaylight\/.*|docker\/.*)'
+    forbidden-files: '(docker\/.*)'
     java-version: "openjdk17"
     jre: "openjdk17"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - argon:
+      - potassium:
           branch: "master"
           dependencies: >
             daexim-maven-merge-{stream},
@@ -69,8 +66,8 @@
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - chlorine:
-          branch: "stable/chlorine"
+      - argon:
+          branch: "stable/argon"
           dependencies: >
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
@@ -78,9 +75,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},
@@ -89,85 +85,6 @@
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
 
-- project:
-    name: distribution-full
-    jobs:
-      # gerrit- is generic template, distribution- is project specific.
-      - "distribution-merge-{type}-{stream}"
-      - "distribution-verify-{type}-{stream}"
-      - "distribution-check-{type}-{stream}"
-
-    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: "openjdk17"
-    karaf-version: odl
-    dist-pom: "distribution/opendaylight/pom.xml"
-    stream:
-      - argon:
-          branch: "master"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - chlorine:
-          branch: "stable/chlorine"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - sulfur:
-          branch: "stable/sulfur"
-          java-version: "openjdk11"
-          dependencies: >
-            distribution-merge-managed-{stream},
-
-- project:
-    name: distribution-release
-    jobs:
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-
-    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"
-    mvn-version: mvn38
-    java-version: "openjdk17"
-    email-upstream: "[int/dist]"
-
-    # Used by the release job
-    staging-profile-id: 2af042ed81d5e2
-
-    stream:
-      - argon:
-          branch: "master"
-      - chlorine:
-          branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          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
     jobs:
@@ -175,7 +92,6 @@
 
     project: integration/distribution
     project-name: distribution
-    build-node: centos8-builder-4c-4g
     branch: master
     java-version: "openjdk17"
     mvn-version: mvn38
@@ -205,12 +121,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
     stream:
-      - argon:
+      - potassium:
           branch: "master"
+      - argon:
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
 
 - project:
     name: distribution-docker-release