X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=f80d7ac7aa8035115e468a9c53161bc5e6eaa709;hb=56eb8f3868acdd16cd093929a0510a66f4dbe101;hp=cfe9b4e342afa335e595345c3388b8fbeeb2e9eb;hpb=0abaee571f249a9da5396f5d44cae9350f2fbf2a;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index cfe9b4e34..f80d7ac7a 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -2,20 +2,19 @@
 - project:
     name: bier-silicon
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: silicon
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
+    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]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"
     disable-job: true
 
     # Used by the release job
@@ -28,15 +27,15 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/aluminium'
+    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
@@ -49,57 +48,47 @@
       - 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
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-sodium
+    name: bier-release-management
     jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: 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]'
-    disable-job: true
+    project: bier
+    project-name: bier
 
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
+    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