X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=b44fb0b28e4382e819f3e9b1d7eb3bee41bc66b9;hb=d068ef383076958351e04dc5007a2e4651cd02f0;hp=2ae17b23ea1e92293a9360a95e61ecd785616151;hpb=0673d0736a8df6f50fc1bdc58e8eda95fa99d388;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 2ae17b23e..b44fb0b28 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -17,24 +17,19 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
     mvn-opts: "-Xmx1024m"
+    mvn-version: mvn38
+    jre: "openjdk17"
+    karaf-version: odl
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
     email-upstream: "[int/dist]"
     stream:
-      - silicon:
+      - scandium:
           branch: "master"
-          java-version: openjdk11
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: openjdk11
-          jre: "openjdk11"
-          karaf-version: odl
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: openjdk11
-          jre: "openjdk11"
-          karaf-version: odl
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
     name: distribution-managed
@@ -50,151 +45,77 @@
     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/**"
+    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:
-      - silicon:
+      - scandium:
           branch: "master"
-          java-version: "openjdk11"
-          jre: "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},
-            neutron-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-          jre: "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},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          jre: "openjdk11"
-          dependencies: >
-            aaa-maven-merge-{stream},
-            bgpcep-maven-merge-{stream},
-            controller-maven-merge-{stream},
-            daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
-            infrautils-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},
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
-    name: distribution-full
+    name: distribution-sonar
     jobs:
-      # gerrit- is generic template, distribution- is project specific.
-      - "distribution-merge-{type}-{stream}"
-      - "distribution-verify-{type}-{stream}"
-      - "distribution-check-{type}-{stream}"
+      - odl-sonar-jobs-jdk17
 
     project: integration/distribution
     project-name: distribution
+    branch: master
     mvn-settings: integration-distribution-settings
-    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: "-Xmx1024m"
-    email-upstream: "[int/dist]"
-    type: full
-    profile: "-Punmanaged"
-    files: "opendaylight/**"
-    karaf-version: odl
-    dist-pom: "distribution/opendaylight/pom.xml"
-
-    stream:
-      - silicon:
-          branch: "master"
-          java-version: "openjdk11"
-          karaf-version: odl
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-          karaf-version: odl
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          karaf-version: odl
-          dependencies: >
-            distribution-merge-managed-{stream},
 
 - project:
-    name: distribution-release
+    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:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-      - gerrit-release-merge
-
-    project: "integration/distribution"
-    project-name: "distribution"
-    mvn-goals: "clean deploy -f opendaylight/pom.xml"
-    mvn-settings: "integration-distribution-settings"
-    mvn-opts: "-Xmx1024m"
-    email-upstream: "[int/dist]"
-
-    # Used by the release job
-    staging-profile-id: 2af042ed81d5e2
-
+      - "{project-name}-gerrit-docker-jobs"
     stream:
-      - silicon:
+      - scandium:
           branch: "master"
-          java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
 - project:
-    name: distribution-sonar
-    jobs:
-      - gerrit-maven-sonar
-
+    name: distribution-docker-release
     project: integration/distribution
-    project-name: distribution
-    branch: master
-    java-version: "openjdk11"
+    project-name: distribution-docker
+    use-release-file: true
     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}"
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     name: distribution-view