Merge "Remove circuitsw from Beryllium"

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index e85e6374ff2d3b9237a7d7e247049232e7012eb4..c0914b445a39baa8939ae904094a4090b6c0825a 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -11,14 +11,16 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
         - stable-helium:
             branch: 'stable/helium'
-
-    jdk: 'openjdk7'
+            jdk: 'openjdk7'
 
 
 - job-template:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cf0c9fae1bb84fbf02e4631114fcdd0a47551455..176c0d4aa196d71904cc1fd0aa06b442e1f32ae0 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,6 +11,7 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -168,8 +169,6 @@
                 vtn-csit-1node-imds-manager-only-{stream},
                 vtn-csit-1node-imds-manager-all-{stream}
 
-    jdk: 'openjdk7'
-
 # Template: integration-verify-python
 # Goal: Verify python scripts correct syntax
 # Operation: This job template performs a python tox check on any integration/test patch

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
index 9eb7e0148b9b9b5289fa5986037a74d7d9651d58..95012b09688441cc0a617ab58bd7c3ba31d6c06d 100644 (file)
--- a/jjb/nemo/nemo.cfg
+++ b/jjb/nemo/nemo.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 5db0c3b33f91fe3b64cb902b3ee7b44651b87b2d..a2c6cd121ee6ba4e63f6e8de5c769d7c4474c057 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium: