Merge "Auto Update CSIT Jobs to run for aluminium"

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 9a4f47ecc35b84365613c0b9c19c8df4513caf34..789c0ddca616864965e34f8794d48550c7be5fbe 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,21 +1,41 @@
 ---
+- project:
+    name: bier-silicon
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: "bier"
+    project-name: "bier"
+    branch: "master"
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-aluminium
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/aluminium"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
     disable-job: true
 
     # Used by the release job
@@ -28,15 +48,15 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/magnesium'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/magnesium"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
     disable-job: true
 
     # Used by the release job
@@ -49,36 +69,47 @@
       - odl-maven-verify-jobs
 
     stream: sodium
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/sodium'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/sodium"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
     disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
+- project:
+    name: bier-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: bier
+    project-name: bier
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: bier-settings
+
 - project:
     name: bier-sonar
     jobs:
       - gerrit-maven-sonar
 
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
+    project: "bier"
+    project-name: "bier"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
     disable-job: true
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: bier-info