Nitrogen branch cutting update

Change-Id: Ie6a57233db9797b0e9d80845037bf32ecbb2adc0
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 0efb7875a234cbe34a40e078aecfbc94ee7afbe2..7406abbfe26ed082422dbc0d7fe6f8cb423427ed 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,39 +1,66 @@
 ---
 - project:
-    name: bier-carbon\r
-    jobs:\r
+    name: bier-nirtogen
+    jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
-\r
-    stream: carbon\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    jdk: openjdk8\r
-    jdks:\r
+
+    stream: nitrogen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
       - openjdk8
-    maven:\r
+    maven:
       - mvn33:
           mvn-version: 'mvn33'
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
-    dependencies: ''\r
-    email-upstream: '[bier]'\r
-    archive-artifacts: ''\r
-\r
-- project:\r
-    name: bier-sonar\r
-    jobs:\r
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-carbon
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: carbon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/carbon'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-sonar
+    jobs:
       - '{project-name}-sonar'
-\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
+
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'