X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=876e7de509fde54e94b9669a35f0c2572a5161b9;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=1c850ce8788c712df2872932997052435a19377c;hpb=30f651a1fc4515dda1e66f4b2f520502bcbd95bf;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 1c850ce87..876e7de50 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -2,86 +2,76 @@
 - project:
     name: netconf-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -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]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
 
 - project:
     name: netconf-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
 
 - project:
     name: netconf-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
 
 - project:
     name: netconf-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'