X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=b9fc80aa5879a20fe81f707677fb50d7c8f777c7;hb=fec89881ec40dd1f7d74bfc77e129784daf4ccde;hp=55704240683c8351dc77dea6be2fbcb186467b45;hpb=564ea6891db06cb85c10a008ea240056ce2610b0;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 557042406..b9fc80aa5 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,108 +1,92 @@
 ---
 - project:
-    name: odlparent-nitrogen
+    name: odlparent-master
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
 
-    stream: nitrogen
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    project: odlparent
+    project-name: odlparent
+    stream: master
+    branch: master
+    distribution_branch: master
 
-- project:
-    name: odlparent-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
-
-    stream: carbon
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
+          mvn-version: mvn33
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-boron
+    name: odlparent-2.0.x
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 2.0.x
+    branch: 2.0.x
+    distribution_branch: master
 
-    stream: boron
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
+          mvn-version: mvn33
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-beryllium
+    name: odlparent-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
 
-    stream: beryllium
+    stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk7
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -112,12 +96,22 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
 
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'