X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=98e1d6bf17cd9f7a1bce8bb4a9c0fde98a2a03e2;hb=3f8cca3f85b5b528254e32f597cee66f277eea11;hp=5a79625e235e89ca5b825e7ca450f54377e73317;hpb=17e405080849c714581eaeb98ad4b20dae1f3ea9;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 5a79625e2..98e1d6bf1 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,9 +1,8 @@
 ---
 - project:
-    name: netconf-aluminium
+    name: netconf-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
@@ -11,27 +10,26 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'master'
+    stream: master
+    project: "netconf"
+    project-name: "netconf"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-magnesium
+    name: netconf-1.13.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
@@ -39,70 +37,106 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/magnesium'
+    stream: 1.13.x
+    project: "netconf"
+    project-name: "netconf"
+    branch: "1.13.x"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-sodium
+    name: netconf-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: aluminium
+    project: "netconf"
+    project-name: "netconf"
+    branch: "stable/aluminium"
+    build-node: centos7-builder-2c-8g
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    build-timeout: 90
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
+- project:
+    name: netconf-1.7.4.x
+    jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/sodium'
+    stream: 1.7.4.x
+    project: "netconf"
+    project-name: "netconf"
+    branch: "1.7.4.x"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
+- project:
+    name: netconf-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: netconf
+    project-name: netconf
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: netconf-settings
+
 - project:
     name: netconf-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'master'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     build-timeout: 90
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: netconf-info