X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Falto%2Falto.yaml;h=99e2fe1d3cbb2fa371f2bd8c06421a543ebaf25f;hb=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;hp=c1a7286d9485dd11257037a5efa91e01a2aa2263;hpb=2e39f0c9fe381855ea45dfd98406b557adecd4c0;p=releng%2Fbuilder.git

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index c1a7286d9..4527fd8e8 100644
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,31 +1,20 @@
+---
 - project:
-    name: alto-carbon
+    name: alto-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -33,70 +22,25 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
-- project:
-    name: alto-boron
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    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-beryllium
+    name: alto-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
+    stream: nitrogen
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -104,34 +48,26 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
-    name: alto-lithium
+    name: alto-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
+    stream: carbon
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/lithium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'alto-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -139,10 +75,13 @@
     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'