Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 98c80bc87357e9155c311d2aa8dd63e0a42054be..c3e95b8132f7849eb1de4cee0f11ad2384d69829 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -3,25 +3,16 @@
     name: faas-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -30,25 +21,16 @@
     name: faas-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -57,26 +39,17 @@
     name: faas-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -84,10 +57,9 @@
 - project:
     name: faas-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'