Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 33df2fd7df51e9025dfa19413417ccf6b4092a79..d1085a28f329ea47b0f5dd0394545862b009bb5a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,88 +2,69 @@
 - project:
     name: alto-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
 
 - project:
     name: alto-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
 
 - project:
     name: alto-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
 
 - project:
     name: alto-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'