X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=0390cc3a0eb3d2e239589e54ca72a2535edbf67c;hb=a18648639efb03b109ce8e447feb77b8edf7a251;hp=75b913502f18f14c8f0de5752258442f057c0af5;hpb=992a94ba358a92a4ed9348f9e3b050a7d43739a2;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 75b913502..0390cc3a0 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,90 +1,66 @@
 ---
 - project:
-    name: infrautils-oxygen
+    name: infrautils-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-nitrogen
+    name: infrautils-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}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/nitrogen'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-carbon
+    name: infrautils-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: carbon
+    stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
 
 - project:
     name: infrautils-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'