Merge "Revert "Fix for generating log.html in Netvirt""

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index e9fe7bb41ce6ebe3dfe446d43d3e8923fb9e8ddf..59f4e5310987bd595910f09386bcf80bb54541d7 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: alto-carbon
+    name: alto-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: oxygen
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,21 +23,21 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
-    name: alto-boron
+    name: alto-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,23 +50,23 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
-    name: alto-beryllium
+    name: alto-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -81,6 +78,9 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-sonar
     jobs: