X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsystemmetrics%2Fsystemmetrics.yaml;h=cf76a47f9980fbf336dbf6b3ffd0c3bdfbb395b3;hb=30273813ce78266be8e47eac1c9db5811c8d51a3;hp=88514e606c22d9a6384fb66046498621e3b29cd3;hpb=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;p=releng%2Fbuilder.git

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 88514e606..cf76a47f9 100644
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -1,76 +1,51 @@
 ---
 - project:
-    name: systemmetrics-oxygen
+    name: systemmetrics-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
 
 - project:
-    name: systemmetrics-nitrogen
+    name: systemmetrics-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: oxygen
+    branch: 'stable/oxygen'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
 
 - project:
-    name: systemmetrics-carbon
+    name: systemmetrics-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: nitrogen
+    branch: 'stable/nitrogen'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
@@ -84,5 +59,4 @@
     project-name: 'systemmetrics'
     branch: 'master'
     mvn-settings: 'systemmetrics-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'