X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fsnmp4sdn%2Fsnmp4sdn.yaml;h=9093535473368bb655f3244c3f667b8e85a2c1a8;hb=5b1581aa990c2e47117aa6147f05931b050fe2e3;hp=fdfb44a895a256bf73399cebf7572ba1edeb4807;hpb=0abaee571f249a9da5396f5d44cae9350f2fbf2a;p=releng%2Fbuilder.git

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index fdfb44a89..909353547 100644
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -2,23 +2,22 @@
 - project:
     name: snmp4sdn-silicon
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
           rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f
       - odl-maven-jobs
       - odl-maven-verify-jobs
-      - gerrit-release-merge
 
     stream: silicon
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'master'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "master"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -26,7 +25,7 @@
 - project:
     name: snmp4sdn-aluminium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
@@ -35,13 +34,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/aluminium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/aluminium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -49,7 +48,7 @@
 - project:
     name: snmp4sdn-magnesium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
@@ -58,13 +57,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/magnesium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/magnesium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -72,7 +71,7 @@
 - project:
     name: snmp4sdn-sodium
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
@@ -81,31 +80,42 @@
       - odl-maven-verify-jobs
 
     stream: sodium
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/sodium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/sodium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
+- project:
+    name: snmp4sdn-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: snmp4sdn
+    project-name: snmp4sdn
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: snmp4sdn-settings
+
 - project:
     name: snmp4sdn-sonar
     jobs:
       - gerrit-maven-sonar
 
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'master'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "master"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
     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: snmp4sdn-info