Remove ARCHIVE_ARTIFACTS overwrite

[releng/builder.git] / jjb / systemmetrics / systemmetrics.yaml

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 041439d6330096d18238b98e877ed4c935c5bf09..63f331149ec0091d354be259085fe78b021a379d 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -1,37 +1,66 @@
+---
+- project:
+    name: systemmetrics-oxygen
+    jobs:
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: oxygen
+    branch: 'master'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
+- project:
+    name: systemmetrics-nitrogen
+    jobs:
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: nitrogen
+    branch: 'stable/nitrogen'
+    mvn-settings: 'systemmetrics-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
+
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
 - project:
     name: systemmetrics-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: carbon
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     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-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'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'