Merge "revert netvirt jvm disable setting. minor fix for shellcheck's exception"

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

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index bab58b8d080bfd29820fcf0499890283bb973637..509485f5d6cead8c5d32de6a99f9f89071af2adf 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -1,16 +1,18 @@
 ---
 - project:
-    name: alto-sodium
+    name: alto-magnesium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
     disable-job: true
@@ -19,17 +21,18 @@
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-neon
+    name: alto-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
     disable-job: true
@@ -38,17 +41,18 @@
     staging-profile-id: 931eabae9693c
 
 - project:
-    name: alto-fluorine
+    name: alto-neon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'alto'
     project-name: 'alto'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
     disable-job: true
@@ -66,7 +70,7 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     disable-job: true
 
 - project: