Merge "BUG-2625: validate sdni using jdk8 only"

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 71fe15bfaf5f0aa97d47e2a87b0d25b53e611d94..1a0b5a77402318849b4cc8eed5347be52a68f591 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,5 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml
index 5e3510ac1ed3d2edec6029244aa69ea6143d143d..8329946ade435de177f3001abdc91117967eb707 100644 (file)
--- a/jjb-templates/periodic.yaml
+++ b/jjb-templates/periodic.yaml
@@ -1,5 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index c17ba14cfad1b9bea2dc83086dc3d4754785fb95..8b63b5e250e6ae5a27de13874cf644f12d438dea 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,5 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
index 242f324a3a095219a9ef955ab942156d2be2aeed..ffcc93dde77cf7a673347b78febb8af07e721e6f 100644 (file)
--- a/jjb/aaa/aaa.cfg
+++ b/jjb/aaa/aaa.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index c258335f65892f9e46c8cd6ec52e7d703926a5cf..03bfd6bf580ba923c7666c40c57bc01b1e69e4bb 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'aaa-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'aaa-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'aaa-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 7488480b8bff4d6260f07b92295851b95f13f400..4d403e367c5894aedf5b0683c560b620c299e789 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -235,6 +235,7 @@
 
 - job-template:
     name: 'alto-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +428,7 @@
 
 - job-template:
     name: 'alto-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +489,7 @@
 
 - job-template:
     name: 'alto-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index c376d0e4a1ae8f93ba67f1feb614c66c520057f6..8d230d56aa4bda4da7e8a641eb9f31e622e06f8c 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'armoury-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'armoury-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'armoury-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 86c72dfbb5fc8527be66867b9289a5b58080c2dd..233219097a468981bd23256675d3065272e8f26e 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -13,7 +13,7 @@
         integration-test: boron
     - beryllium:
         branch: 'stable/beryllium'
-        jdk: 'openjdk8'
+        jdk: 'openjdk7'
         integration-test: beryllium
     - lithium:
         branch: 'stable/lithium'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index b0ba0ec7bc94107ddae6a0447426f20ff55ab4a4..bf69777980e7e3b32ddc393618a68a4f5ab02224 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -46,8 +46,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index 0d2b7672748b281f008e90dddc6d602edb9bc62a..97f28382e0129118e97af3539f6c8839315aaa45 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index bcd3c74d3861e17bffcd1769215a3213014935dc..1e7d345e577712040ad9a7563764ced17a45dfab 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'bgpcep-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'bgpcep-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'bgpcep-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index 1e2e1ed7c4663956340504c23a829bbfa7aa3a64..124a1dcfa787e048f5d7552b14235615c8d4808b 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -1,10 +1,12 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
+    autorelease: true
 - beryllium:
     branch: beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 3ab13a0e219b6ce425d9e50428c3083082632f9c..7e0d223c58f75777723f4c0555b2517f2b74ecdf 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -21,18 +21,17 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - beryllium:
             branch: 'beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'capwap-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'capwap-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'capwap-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 24dd18fe8ba6940726bdf1ad6a0adf7af6821b57..1e93acb2a23169cb3e8c3af1b573fc3806b20e9a 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'centinel-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'centinel-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'centinel-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 341287fb328a4dea447a5b2c4b72447cb0734006..f9ad7fc2e73592438b050c3ae2e0f33c34ccb8ae 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 16d7adf2f21c11adfd302113cfbe3a8c6836b9e2..4e8c3a2a060d0a0d53c395deae3d8d93f6134f3a 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'controller-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'controller-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'controller-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 6aa35c18c1b9dbe1528006ca4b97dd23cc032ff1..70ef3dd524b8fcb37cd31472bd0bc23187de4f53 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -233,6 +233,7 @@
 
 - job-template:
     name: 'coretutorials-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -425,6 +426,7 @@
 
 - job-template:
     name: 'coretutorials-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -485,6 +487,7 @@
 
 - job-template:
     name: 'coretutorials-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index 7dfa29f2407793185799b7ac530cca371a57b72b..8b92f23d4fa16b9cbcf7363e277d44da5c0aff53 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -239,6 +239,7 @@
 
 - job-template:
     name: 'defense4all-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -431,6 +432,7 @@
 
 - job-template:
     name: 'defense4all-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -491,6 +493,7 @@
 
 - job-template:
     name: 'defense4all-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
new file mode 100644 (file)
index 0000000..1bdcfcb
--- /dev/null
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: didm-csit-discovery
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'didm'
+
+    # The functionality under test
+    functionality: 'discovery'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-didm-all'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'didm-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg
index 17c8ebabfaada5b8e7f7352ed058668923833907..8d890570e1310edffc692fe34babfe6dbf852878 100644 (file)
--- a/jjb/didm/didm.cfg
+++ b/jjb/didm/didm.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 84e42e20a010512204f9dd8da4cb8c36adeb8342..27fb23cc4598b118b48d2153f71bd508b4fb52c3 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'didm-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'didm-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'didm-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e1da147d86ccdfdfbad56396cfaf01da440d583a..130daaccd1a19c79403334d4f8feb072e1a77dd0 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -227,6 +227,7 @@
 
 - job-template:
     name: 'discovery-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -419,6 +420,7 @@
 
 - job-template:
     name: 'discovery-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -479,6 +481,7 @@
 
 - job-template:
     name: 'discovery-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 0f425ccdd639f04069959462ea138d598801b6ed..71eb1e645676988f0961a930cf0a02fefe70aa94 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'dlux-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'dlux-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'dlux-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
index 98da554a410afa0ef92953dff905e08f3ccc7a1e..7bbe20d44bcb4632a8bff1b4cc87ec8fb9a370c8 100644 (file)
--- a/jjb/docs/docs.cfg
+++ b/jjb/docs/docs.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 44046a59f4325c933a7b528057d91a3878e1611a..e358628b5968b7ba24e32887e41f19e0285d09b5 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'docs-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'docs-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'docs-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 82dda4f6cb6bba84b2c1b00300abb3fcb0a67b88..521471eacd6195622946136c28617591f224f3a6 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'faas-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'faas-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'faas-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml
new file mode 100644 (file)
index 0000000..8c29a01
--- /dev/null
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml
@@ -0,0 +1,22 @@
+- project:
+    name: groupbasedpolicy-csit-netvirt
+    jobs:
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'groupbasedpolicy'
+
+    # The functionality under test
+    functionality: 'devstack'
+
+    # Mininet configuration
+    mininet-image: 'rk-c7-devstack'
+    mininet-cloud-name: 'Rackspace DFW - Devstack'
+    mininet-vms: 1
+
+    # Features to install
+    install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
+
+    # Robot custom options
+    robot-options: ''
+

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index c6e3292e32ab83b262a68e08e7f6c62b0082e079..f2ee3b25ebfca5785f8d250f7a58e6c1b97c16d1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 6cb6b6b488520f06cbade883b76582e82585cba0..ee84d5dbd35323a280511754cc9c54e565530fe8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/integration/distribution/distribution.cfg b/jjb/integration/distribution/distribution.cfg
index 3dbcb82cd52542784524066036608d3379b55bab..242ba25398ad8c48fad6580b4ef61d91f5e63920 100644 (file)
--- a/jjb/integration/distribution/distribution.cfg
+++ b/jjb/integration/distribution/distribution.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk8,openjdk7
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 0929863663f3201ebf382765081e6ee3f53e3445..4ab3c842161376bc987bcc7d09fe754c40ce8c51 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -19,7 +19,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-                - openjdk7
             disable_autorelease: False
         - beryllium:
             branch: 'stable/beryllium'
@@ -39,6 +38,7 @@
 
 - job-template:
     name: 'distribution-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -99,6 +99,7 @@
 
 - job-template:
     name: 'distribution-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index 97c4f548a9f470a0b9e92680b2fd22e2aa0daf07..c91f3f301c21ddc9e0b0f1b03b670dfb1f708940 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -48,9 +48,12 @@ sleep 10
 echo "Installing all features..."
 sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
-echo "Killing ODL and fetching Karaf log..."
-tail --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+echo "dumping first 500K bytes of karaf log..."
+head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+echo "dumping last 500K bytes of karaf log..."
+tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
 # TODO: Do we want different name for karaf.log chunk to signal it may be not complete?
+echo "killing karaf process..."
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 sleep 5
 xz -9ekvv "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 7f0faa4534703e19bb71298e88f81127868bc972..536458cf7a67166b15beffb2596260d34e3fb0ba 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -88,8 +88,10 @@ while true; do
         break
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
-        echo "Dumping Karaf log..."
-        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -110,8 +112,10 @@ function exit_on_log_file_message {
     echo "looking for \"\$1\" in log file"
     if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
         echo ABORTING: found "\$1"
-        echo "Dumping Karaf log..."
-        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index de1aee3643217159459e40ebcbed00a39eb13b6f..d7b57d004a749e3df0ff05d06a913ccb23079bf7 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -76,8 +76,10 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
     if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then
         echo ABORTING: found "$1"
-        echo "Dumping first 1M of karaf.log..."
-        tail --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1
@@ -86,8 +88,10 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf_console.log file"
     if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then
         echo ABORTING: found "$1"
-        echo "Dumping first 1M of karaf_console.log..."
-        tail --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 154d1261fdc614ad2a1207be858671e24f991996..d6d1bfb04ca03024bb3248d558381f896441a8c6 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -25,8 +25,10 @@ while true; do
         break
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
-        echo "Dumping Karaf log..."
-        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -44,8 +46,10 @@ function exit_on_log_file_message {
     echo "looking for \"\$1\" in log file"
     if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "\$1"
-        echo "Dumping Karaf log..."
-        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }
@@ -94,12 +98,15 @@ TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_
 -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
 -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
-echo "Killing ODL and fetching Karaf log..."
 set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    ssh "${!CONTROLLERIP}" tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log"
+    echo "dumping first 500K bytes of karaf log..." > "odl${i}_karaf.log"
+    ssh "${!CONTROLLERIP}" head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log"
+    echo "dumping last 500K bytes of karaf log..." >> "odl${i}_karaf.log"
+    ssh "${!CONTROLLERIP}" tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log"
+    echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
 sleep 5

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-templates.yaml b/jjb/integration/integration-templates.yaml
index c393b38dfe6fc0b0f4e76d845e87479d0a1b614f..7c6a1276d3f6d12fc3d08b70b2382ca304c6a869 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -29,6 +29,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -106,6 +107,7 @@
 
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -154,6 +156,7 @@
             users:
                 - '{ssh-credentials}'
 
+
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
@@ -212,6 +215,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -289,6 +293,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -391,6 +396,7 @@
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -491,6 +497,7 @@
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -570,6 +577,7 @@
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -674,6 +682,7 @@
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cf0c9fae1bb84fbf02e4631114fcdd0a47551455..a1e9f075c893d4cc3d63e6002ae4cacbed6f5ba8 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: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -60,6 +61,7 @@
 
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -109,6 +111,7 @@
 
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -152,6 +155,7 @@
 
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
@@ -168,8 +172,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/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 52a0e7b26b975f0576507db69fff5f173c4486e9..d6476d4953609431c54b155cc9267632c2a9d3c6 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index f97d3527da44496be78ac7f5172409af490a8f74..35f3e8300e5ac9ebbdbafa39b8d901943cf8fa7f 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -236,6 +235,7 @@
 
 - job-template:
     name: 'iotdm-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +428,7 @@
 
 - job-template:
     name: 'iotdm-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +489,7 @@
 
 - job-template:
     name: 'iotdm-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index 23a5052862b46d306788ffea6fa92e05d8421152..b9100198006220475d6c619eafbc1b2e816d8a80 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 3eb0945ea364c220faec07b9b04db84f312e7def..6e006d7d0aabe5facd79692b39829e5482412b57 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'l2switch-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'l2switch-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'l2switch-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
index 36a241fdfa39bc1eaee57df7e360535ad67e1700..21dde05a7d49b6ec1466906eefd2879130ecf148 100644 (file)
--- a/jjb/lacp/lacp.cfg
+++ b/jjb/lacp/lacp.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 33c17bceee4db87afa18f20baa2d7573a2f24c61..a1c5eb53f9351f00364ae8bfb75fad5a3ca0e0c2 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'lacp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'lacp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'lacp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
index a5ad2b6c7983cd3230cad039e5a4b83a41706485..d1ba0edc11d47992839cc3264cbccf51aafe8bfc 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ b/jjb/lispflowmapping/lispflowmapping.cfg
@@ -2,7 +2,7 @@ MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 96f09e94407aeb53d9e5789a9417ad13cf61b34a..bb5d52921c5b909bdad46b236da745111490058d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'lispflowmapping-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'lispflowmapping-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'lispflowmapping-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index 08dad7035bf4f4079ca3e1e5014e88a006974852..cf46c9befafda6df8084008a6632c183e4552335 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index e055dbd3caeeeec8b735bbb3c210d3466330a525..bde45ef7397be9bf40938131d0f0ad533faf5937 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'mdsal-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'mdsal-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'mdsal-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
new file mode 100644 (file)
index 0000000..35b4800
--- /dev/null
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: messaging4transport-csit-basic
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'messaging4transport'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-messaging4transport-api,odl-messaging4transport'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},messaging4transport-distribution-{stream}'

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index 1f7a0d7ff0344c8b151f2a4e8b12907a0c72f9fe..b0c3a1d7785d1d5048c34d2248dee4117b4c900e 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -2,7 +2,7 @@ DEPENDENCIES: yangtools,aaa,controller,odlparent
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 5dfc5ac62c4d384dc0e3c5606d03c789e5df5ca3..46e29f73ed943f99487b6cb959b23939cfc97cac 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'messaging4transport-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'messaging4transport-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'messaging4transport-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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..bb88a4bf7fc11d70594535ccf9669f20dd495feb 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:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'nemo-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'nemo-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'nemo-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
new file mode 100644 (file)
index 0000000..7e04d57
--- /dev/null
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: netconf-csit-clustering
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'netconf'
+
+    # The functionality under test
+    functionality: 'clustering'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-netconf-clustered-topology'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index 1f20441c17fffb273a3fc0f31dc66096e12bcc0c..68cb909719735ad55e61a4bddd4465b85fce67ec 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 35cde813142b67ce6bd25e261b4365a8d6ce5324..806aca65998156de2ba1fbf3af9abe8ea2006f98 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'netconf-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'netconf-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'netconf-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index 7dfad3740436c9078fe13464fe89769e81509bdf..b6e00ffe78cb01fe79465d513589ae4bc5eff449 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -1,7 +1,7 @@
 STREAMS:\r
 - boron:\r
     branch: master\r
-    jdks: openjdk7,openjdk8\r
+    jdks: openjdk8\r
     autorelease: true\r
 - beryllium:\r
     branch: stable/beryllium\r

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 0f530d3427359a269e206ad0b6ffb5671146a04a..bfffc53878ea3889b5fe4cfb9ce7c0a5b365deba 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'netide-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'netide-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'netide-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 9c4bc6e7da9aaa54545945c8cd21e3b0dfd5af8b..8ff295cd5c4847a520e47e9efe2f0e832220a989 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -1,6 +1,7 @@
 - project:
     name: neutron-daily-openstack
     jobs:
+        # TODO: Do we want boron job too?
         - 'neutron-daily-openstack-beryllium'
 
     project: 'neutron'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 11abd14f9f132522dc5ada76655c33c5f4cb6d45..18c3a43311561657c9850504147a03a54d597228 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'neutron-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,6 +427,7 @@
 
 - job-template:
     name: 'neutron-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -486,6 +488,7 @@
 
 - job-template:
     name: 'neutron-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 225287d2f9c8e13b8ec761fa65418901adbfc4f3..491c406787ae1fb1109c7e8a1d38c64b174f5b00 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'next-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'next-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'next-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
index f6cb7b747f87d085aead09116088d66dec3f9f3c..8195f302a819853a778df6a8deeecae8d9277881 100644 (file)
--- a/jjb/nic/nic.cfg
+++ b/jjb/nic/nic.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 439945c334f46b8b69bc93b578dec8b8e6575ff8..a5d3fc5734bd35c9d8397dba922062e5959f13d5 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'nic-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'nic-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'nic-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 71679495325552d5c955e07b26781042c21ccb1e..d9a683324af091d7aa3cf3e65503778d29cebdfa 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'odlparent-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'odlparent-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,6 +494,7 @@
 
 - job-template:
     name: 'odlparent-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index df5919130c37b84df1933c04d6e2daed979b6e3b..bbf7c065d327435889e3333851602f968a5f9e82 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'of-config-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'of-config-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'of-config-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg
index ab4492c7986df438af6b5fcc8b0d4603437865f2..61dc15c0e619efbe93121597b98f1ecf09063cc3 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.cfg
+++ b/jjb/ofextensions/circuitsw/circuitsw.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - boron:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - beryllium:
     branch: stable/beryllium
     jdks: openjdk7,openjdk8

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index f3b54b504ed564e91c686d3b538edaa1182a3f84..bd36e2f30e572a35ecd0c41ef5891a2d8fbbdc16 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -25,7 +25,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk7
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'circuitsw-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'circuitsw-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'circuitsw-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index 8f5dc6c3d3ac34c5c3bbccb75d88ccbe61e9a709..92831127c493183341da198e5e123fd7aa91db54 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 85919dc930a8a56aad246304406b408753327ef7..9e22c837f1954f3bbba4e9035c7ef1631a0784cf 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'openflowjava-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'openflowjava-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'openflowjava-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
new file mode 100644 (file)
index 0000000..ac7bf89
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
@@ -0,0 +1,34 @@
+- project:
+    name: openflowplugin-csit-clustering-helium-design
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'clustering-helium-design'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index ba02036581471a5c22c338265d030796c9f7ac35..289bffdffe41719e0760e2808affd2a5d38bf54b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -27,7 +27,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
similarity index 94%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 9d9002584a1b593afa3eb4a243339b0277a2bf2f..d311dc6f6d7432cd05180e71a53c5e88efec3952 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-beryllium
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index a293df9139f0677d00c3043ea4e7a15be14140f4..18bcf432df980050103a13e9f051421726462922 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index e5412763c2e8fd5101b5f82c6048901db5512735..c4a8785ecdd4377a94775eecae6364e517fef48e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'openflowplugin-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'openflowplugin-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'openflowplugin-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index f179066c21d90891a9a695ccc218a55dc0191731..a6d3fde7b04a8a3a849a2799a581be107095b1b4 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 6e5478e8084a1284b99d87bb7aa18f910d929b58..b696a8117b78aa57c3f2a0eab94ddd91b3722ae7 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -20,9 +20,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -240,6 +239,7 @@
 
 - job-template:
     name: 'ovsdb-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +432,7 @@
 
 - job-template:
     name: 'ovsdb-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index f34cb9d8b5825e9ab26de86b3cb7eca6d094242f..882aa899c69a6d423c53a737f4308157a05ff7fe 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'packetcable-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'packetcable-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'packetcable-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 40d8a8fef3b1d3d9ab84675a0e5e956c4bd63094..43d16e861ec5a5897e3d8e66dbe7eaefd1d39e91 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -236,6 +236,7 @@
 
 - job-template:
     name: 'persistence-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +429,7 @@
 
 - job-template:
     name: 'persistence-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +490,7 @@
 
 - job-template:
     name: 'persistence-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index c8c58449435608385af9b83fffa6eff653807ff9..2f144d8427a0759fc8060c0c1d7b3dc24362406f 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 02387c89c6b490a41cfb2c7d7e028d07813ffc5b..fa5fcfd0b610652e8d033ceac639025b30c9ef9b 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'reservation-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'reservation-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'reservation-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 144d6f63fd5dce9709ec6c169e15b6d264f41530..b80802d5e6d8defc0a546816246a4be2286ddad4 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -242,6 +242,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +435,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +496,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a35ab2e4ff1dadacce89656b495d74bdd700a33d..16eb37fe93c42a6780fe385a31d2c44108d3f24e 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'sfc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'sfc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'sfc-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 494134784bfae7e9b3e2daa022261b7307b064f0..6d8765c4d1869007553428f5550f95e29d7c896e 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'snbi-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'snbi-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'snbi-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 279378ec9771c874d5b2e410eb597205d1f614ce..be76c1db46eb41b84551f6adda9341a12b0c89cb 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -236,6 +236,7 @@
 
 - job-template:
     name: 'snmp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +429,7 @@
 
 - job-template:
     name: 'snmp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +490,7 @@
 
 - job-template:
     name: 'snmp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 631f35f59e31ea93016f67b564318736634c3767..9f8ea793045c730b669fabd943412fabf6de438a 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'snmp4sdn-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'snmp4sdn-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'snmp4sdn-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index 891229cd064f28c4ffb26b266f634e945120b21a..72fc254aada4d46330e3d27fb8ab84b3a0aa3331 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1eba22982fc1abb1bbe540f4b8cc8c0194ac998a..9f47c069d48bac816928a0d880ebffdecfc06cba 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'sxp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'sxp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'sxp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
index 64e8794ae75de48e95524d6114a8ae7ae42e6346..bd5e53bbaec2ce3778bfe0559e7af8817e5d9a01 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ b/jjb/tcpmd5/tcpmd5.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index b2f9b1c160f94667fe637ce9b1c13e28f1402dd8..6617e9ce8b57398de8d831efeb0d4a54e1642adb 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'tcpmd5-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'tcpmd5-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'tcpmd5-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 626def783b8ff1ac61d42104a43fabb0869eb8f2..b798a6b257fc0c45f07585d3fab83ad262b97a74 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -227,6 +227,7 @@
 
 - job-template:
     name: 'toolkit-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -419,6 +420,7 @@
 
 - job-template:
     name: 'toolkit-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -479,6 +481,7 @@
 
 - job-template:
     name: 'toolkit-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index 241ffc23d700b50689462d038e68050ce9201b6c..c14853de40ac1774334d9e89dd90b9d603c14ef2 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index c9d6b665f53ef52a1988279b9d2f5ec1cc68e9ab..8f4a6d35ce6bf345576251a1d15342889cfd2b1b 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -236,6 +235,7 @@
 
 - job-template:
     name: 'topoprocessing-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +428,7 @@
 
 - job-template:
     name: 'topoprocessing-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +489,7 @@
 
 - job-template:
     name: 'topoprocessing-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index f632eb01d2d1a98229a50e71cdc2222cd6146d95..148ce772f0a5d8c0a8103e77b7208ce0b8a16af9 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hbase'
+    install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector'
 
     # Robot custom options
     robot-options: ' '

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
new file mode 100644 (file)
index 0000000..e2f1c07
--- /dev/null
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: tsdr-csit-hsqldb
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'hsqldb-datastore'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index d422e4d1190f42009b7cea8da3d932710026f743..890464fc28ba1f3685a4fe29dfa62cb9375d5af9 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -235,6 +235,7 @@
 
 - job-template:
     name: 'tsdr-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +428,7 @@
 
 - job-template:
     name: 'tsdr-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +489,7 @@
 
 - job-template:
     name: 'tsdr-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg
index 98da554a410afa0ef92953dff905e08f3ccc7a1e..7bbe20d44bcb4632a8bff1b4cc87ec8fb9a370c8 100644 (file)
--- a/jjb/ttp/ttp.cfg
+++ b/jjb/ttp/ttp.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index cdf1cea6658c3c8cc26019ce108a993ada36546e..3e8d1e2d09238d4e8c2db98fd1804a5dabdbf340 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'ttp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'ttp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'ttp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
index 075716814dd3c0d887e7c86902165f9745b2b719..16be8f30fc3b9f7760500a856bfee6913d9a4b9b 100644 (file)
--- a/jjb/unimgr/unimgr.cfg
+++ b/jjb/unimgr/unimgr.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 23b5192dcfc8abb1900ba24746bcb7b153594ca7..f4519257fe00c4d07f262b7cd02230be62c1ff18 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'unimgr-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'unimgr-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'unimgr-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 5cdadb56dbc35e8f73a628b49ab917c49b72a411..98a2308b0cbab0ba94ba0e24813516e76bc6b5e8 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -236,6 +236,7 @@
 
 - job-template:
     name: 'usc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +429,7 @@
 
 - job-template:
     name: 'usc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +490,7 @@
 
 - job-template:
     name: 'usc-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 12e0286ed25750c05d2d5b226708a032bd3d4d0a..68dffa4bb0404a6b1e04aec71e9aabcc7beda73b 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'usecplugin-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'usecplugin-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'usecplugin-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 9d649c8109f47560fe65b352671f1e6ede3d38b3..ad4a6566f14d315053e4c11d603f50b568af2030 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -235,6 +235,7 @@
 
 - job-template:
     name: 'vpnservice-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +428,7 @@
 
 - job-template:
     name: 'vpnservice-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +489,7 @@
 
 - job-template:
     name: 'vpnservice-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index 843bfa6b60293a5e28c0bba2aa7e1a262b823bd5..72df9f84b1b11a345ee78b8776db832d57bc3160 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 847ce3fd377b7843d779e8c9dad109bb1c81f2d9..d3544de77168d9647b4fbc87b5b5de9e1e173ab5 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'vtn-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'vtn-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'vtn-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index d3351f81704f82230694b5d362279eb167cc8721..2e3f416cbd374b2d8f29a62bde509b0a788a1016 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'yang-push-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'yang-push-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'yang-push-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index a0c7ed464d98e5fa62b45fee8c7f44846a90c708..364f35509291be2af8a25b6a19a8c617aaec4b89 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,3 +1,24 @@
+- project:
+    name: yangtools-verify-boron
+    jobs:
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
+
+    jdk:
+        - openjdk8
+
+    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
+    maven:
+        - mvn32:
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
+
+    stream:
+        - boron:
+            branch: master
+
+    project: 'yangtools'
+
 - project:
     name: yangtools-verify-beryllium
     jobs:
@@ -17,8 +38,6 @@
             mvnver: '{mvn33}'
 
     stream:
-        - boron:
-            branch: master
         - beryllium:
             branch: stable/beryllium
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index c5b72a031d7a920f8a8fac1a095008d2d2bc1c3a..c39d4fbc17e6f2e2d4f625ae96cad28bdfcb92f1 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -163,6 +163,7 @@
 
 - job-template:
     name: 'yangtools-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -355,6 +356,7 @@
 
 - job-template:
     name: 'yangtools-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -415,6 +417,7 @@
 
 - job-template:
     name: 'yangtools-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index a7143aa77540bd3e78426597bb52c011be8af9f2..417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -69,7 +69,7 @@ if cfg.get("STREAMS"):  # this is a list of single-key dicts
     for stream_dict in cfg.get("STREAMS"):
         streams.update(stream_dict)
 else:
-    streams = {"beryllium": jjblib.STREAM_DEFAULTS["beryllium"]}
+    streams = {"boron": jjblib.STREAM_DEFAULTS["boron"]}
 
 first_stream = streams.iterkeys().next()  # Keep master branch at top.
 sonar_branch = streams[first_stream]["branch"]

diff --git a/scripts/jjblib.py b/scripts/jjblib.py
index 56e98d6aa56f100ac0827ed69b17d8722db249a6..50c5643702b4dec092f8b268d73cd58154d30964 100644 (file)
--- a/scripts/jjblib.py
+++ b/scripts/jjblib.py
@@ -32,7 +32,8 @@ def parse_jjb_args():
 
 
 STREAM_DEFAULTS = collections.OrderedDict([
-    ("beryllium", {"branch": "master", "jdks": "openjdk8"}),
+    ("boron", {"branch": "master", "jdks": "openjdk8"}),
+    ("beryllium", {"branch": "stable/beryllium", "jdks": "openjdk8"}),
     ("stable-lithium", {"branch": "stable/lithium", "jdks": "openjdk7"}),
     ("stable-helium", {"branch": "stable/helium", "jdks": "openjdk7"}),
 ])