Merge "Configure OpenJDK11 for jsonrpc-sonar job"

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
index c58822c8cbe2973b06753ff3f73b61b5558558e9..44dff335252e39050d4f652c3ae6702f5e70c3b7 100644 (file)
--- a/jjb/autorelease/validate-autorelease-aluminium.yaml
+++ b/jjb/autorelease/validate-autorelease-aluminium.yaml
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: aluminium
-    branch: master
+    branch: stable/aluminium
     project-name:
       - aaa:
           project: aaa

diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
index 56fb982433670f63be98d196e83db64709e33e37..6f7af118768698b7b662ff7eb25be1b1e4720de8 100644 (file)
--- a/jjb/autorelease/view-autorelease-aluminium.yaml
+++ b/jjb/autorelease/view-autorelease-aluminium.yaml
@@ -22,17 +22,17 @@
     name: Merge-Aluminium
     description: 'List of Aluminium Merge jobs for Autorelease'
     job-name:
-      - 'aaa-merge-aluminium'
-      - 'bgpcep-merge-aluminium'
-      - 'daexim-merge-aluminium'
-      - 'genius-merge-aluminium'
-      - 'integration/distribution-merge-aluminium'
-      - 'jsonrpc-merge-aluminium'
-      - 'lispflowmapping-merge-aluminium'
-      - 'netconf-merge-aluminium'
-      - 'netvirt-merge-aluminium'
-      - 'neutron-merge-aluminium'
-      - 'openflowplugin-merge-aluminium'
-      - 'ovsdb-merge-aluminium'
-      - 'serviceutils-merge-aluminium'
+      - 'aaa-maven-merge-aluminium'
+      - 'bgpcep-maven-merge-aluminium'
+      - 'daexim-maven-merge-aluminium'
+      - 'genius-maven-merge-aluminium'
+      - 'integration/distribution-maven-merge-aluminium'
+      - 'jsonrpc-maven-merge-aluminium'
+      - 'lispflowmapping-maven-merge-aluminium'
+      - 'netconf-maven-merge-aluminium'
+      - 'netvirt-maven-merge-aluminium'
+      - 'neutron-maven-merge-aluminium'
+      - 'openflowplugin-maven-merge-aluminium'
+      - 'ovsdb-maven-merge-aluminium'
+      - 'serviceutils-maven-merge-aluminium'
     <<: *releng_autorelease_view_common_aluminium