X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=32830d9861c07f3e49961997c154eb2932887993;hb=1479200e41074649b668378b9c8fbd1e8e485481;hp=42be4bd8a1ee46ee140c320f55332c89b6ced2a6;hpb=05f83e84c069799d6cab55e0cacd7fd42982880b;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 42be4bd8a..32830d986 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -14,22 +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:
-      - phosphorus:
+      - argon:
           branch: "master"
-      - silicon:
-          branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
+      - chlorine:
+          branch: "stable/chlorine"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: openjdk11
 
 - project:
     name: distribution-managed
@@ -42,55 +45,46 @@
 
     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/**"
-    java-version: "openjdk11"
-    jre: "openjdk11"
+    forbidden-files: '(opendaylight\/.*|docker\/.*)'
+    java-version: "openjdk17"
+    jre: "openjdk17"
     karaf-version: karaf4
     dist-pom: "distribution/pom.xml"
 
     stream:
-      - phosphorus:
+      - argon:
           branch: "master"
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
           dependencies: >
-            aaa-maven-merge-{stream},
-            bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
-            neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
@@ -105,27 +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:
-      - phosphorus:
+      - argon:
           branch: "master"
           dependencies: >
             distribution-merge-managed-{stream},
-      - silicon:
-          branch: "stable/silicon"
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
             distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
           dependencies: >
             distribution-merge-managed-{stream},
 
@@ -133,27 +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:
-      - phospshorus:
+      - argon:
           branch: "master"
-      - silicon:
-          branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
+      - 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
@@ -162,8 +175,10 @@
 
     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
     mvn-opts: "-Xmx1024m"
@@ -172,6 +187,42 @@
     sonarcloud-api-token: "{sonarcloud_api_token}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
+- project:
+    name: distribution-docker
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
+    docker-name: "opendaylight/opendaylight"
+    docker-root: "$WORKSPACE/docker"
+    docker-build-args: "--network=host"
+    container-public-registry: nexus3.opendaylight.org:10001
+    container-push-registry: nexus3.opendaylight.org:10003
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "docker/.*"
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - argon:
+          branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
+      - sulfur:
+          branch: "stable/sulfur"
+
+- project:
+    name: distribution-docker-release
+    project: integration/distribution
+    project-name: distribution-docker
+    use-release-file: true
+    mvn-settings: integration-distribution-settings
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
+
 - project:
     name: distribution-view
     views: