X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=654a375c5cd6d97723f87b9e88d82531765aebc2;hb=e10b4bba5403db949e30994838c92efd093667c2;hp=dd4e68ccd5a5b8e1f37e4d03e41a03dc6bd2bca5;hpb=b9de81235c99e8a467a5dc0a321b18d4318a2277;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index dd4e68ccd..654a375c5 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -3,11 +3,11 @@
     name: distribution
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-sanity-{stream}'
+      - "distribution-sanity-{stream}"
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           project-pattern: integration/distribution
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
           rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
@@ -15,199 +15,133 @@
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
+    mvn-version: mvn38
+    java-version: openjdk17
+    jre: "openjdk17"
+    karaf-version: odl
     nexus-iq-namespace: odl-
     nexus-iq-stage: release
-    email-upstream: '[int/dist]'
+    email-upstream: "[int/dist]"
     stream:
-      - magnesium:
-          branch: 'master'
-          java-version: 'openjdk11'
-          karaf-version: odl
-      - sodium:
-          branch: 'stable/sodium'
-          karaf-version: odl
-          # Self-Managed projects repos and features:
-          sm-repos: >
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
-          sm-features: >
-              odl-transportpce,
-              odl-transportpce-api,
-              odl-transportpce-ordmodels
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          # Self-Managed projects repos and features:
-          sm-repos: >
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
-          sm-features: >
-              odl-transportpce,
-              odl-transportpce-api,
-              odl-transportpce-ordmodels
+      - potassium:
+          branch: "master"
+      - argon:
+          branch: "stable/argon"
+      - chlorine:
+          branch: "stable/chlorine"
 
 - project:
     name: distribution-managed
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{type}-{stream}'
-      - 'distribution-verify-{type}-{stream}'
-      - 'distribution-check-{type}-{stream}'
-      - 'distribution-csit-managed-{stream}'
+      - "distribution-merge-{type}-{stream}"
+      - "distribution-verify-{type}-{stream}"
+      - "distribution-check-{type}-{stream}"
+      - "distribution-csit-managed-{stream}"
 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    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/**'
+    profile: "-Pmanaged"
+    forbidden-files: '(docker\/.*)'
+    java-version: "openjdk17"
+    jre: "openjdk17"
     karaf-version: karaf4
-    dist-pom: 'distribution/pom.xml'
+    dist-pom: "distribution/pom.xml"
 
     stream:
-      - magnesium:
-          branch: 'master'
-          java-version: 'openjdk11'
+      - potassium:
+          branch: "master"
           dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-      - sodium:
-          branch: 'stable/sodium'
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
+      - argon:
+          branch: "stable/argon"
           dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-              sfc-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
+      - chlorine:
+          branch: "stable/chlorine"
           dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-              sfc-merge-{stream}
+            daexim-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},
 
 - 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}'
+      - gerrit-maven-sonar
 
     project: integration/distribution
     project-name: distribution
+    branch: master
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: integration-distribution-settings
-    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:
-      - magnesium:
-          branch: 'master'
-          java-version: 'openjdk11'
-          karaf-version: odl
-          dependencies: >
-              distribution-merge-managed-{stream},
-      - sodium:
-          branch: 'stable/sodium'
-          karaf-version: odl
-          dependencies: >
-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          dependencies: >
-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
+    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}"
 
 - 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:
-      - magnesium:
-          branch: 'master'
-          java-version: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
+      - potassium:
+          branch: "master"
+      - argon:
+          branch: "stable/argon"
+      - chlorine:
+          branch: "stable/chlorine"
 
 - 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'
+    container-tag-method: yaml-file
+    build-node: centos7-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     name: distribution-view
     views:
       - common-view
     view-name: distribution
-    view-regex: '^(integration-)?distribution-.*'
+    view-regex: "^(integration-)?distribution-.*"