Remove ARCHIVE_ARTIFACTS overwrite

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

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 1fb24c0077583ecf1e0996b4e6aece4f5fd84892..7a382b6795dc22daafef12993a635328f93aa4ea 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -4,24 +4,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -31,24 +23,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -58,25 +42,17 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -84,13 +60,9 @@
 - project:
     name: topoprocessing-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'