X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsystemmetrics%2Fsystemmetrics.yaml;h=d3bd2887352ebb07bdd41fc97786aae795c5838f;hb=07568191388cf45a9525d473a9d59df7c177e78e;hp=20b2903e9b11c15d744332fb6b9ff1e0181bf6e9;hpb=49f4eb3d8737771bb1e10eaab69eb145c858f5db;p=releng%2Fbuilder.git

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 20b2903e9..d3bd28873 100644
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -1,79 +1,17 @@
 ---
 - project:
-    name: systemmetrics-oxygen
+    name: systemmetrics-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{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
-    jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    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-carbon
-    jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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
@@ -81,11 +19,10 @@
 - project:
     name: systemmetrics-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'systemmetrics'
     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'