Merge "Tell netconf-ready in clustering job to not use netconf connector"

diff --git a/jenkins-scripts/controller.sh b/jenkins-scripts/controller.sh
index 893a04118a9bd9c55ae2a4a6af833fa089e0e0b4..2f5f94b42a46d0cfb2a13785e70ab3964fe49ed4 100755 (executable)
--- a/jenkins-scripts/controller.sh
+++ b/jenkins-scripts/controller.sh
@@ -16,6 +16,19 @@ wget --no-verbose https://archive.apache.org/dist/hbase/hbase-0.94.15/hbase-0.94
 echo "Installing the Hbase Server..."
 tar -xvf hbase*.tar.gz
 
+
+#Installation of Cassandra
+
+
+mkdir /tmp/cassandra
+cd /tmp/cassandra
+
+wget --no-verbose http://www.eu.apache.org/dist/cassandra/2.1.12/apache-cassandra-2.1.12-bin.tar.gz
+
+echo "Installing the Cassandra Server..."
+tar -xvf apache*.tar.gz
+
+
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
 Defaults:jenkins !requiretty
 jenkins     ALL = NOPASSWD: ALL

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.yaml b/jjb/aaa/aaa.yaml
index 884c32c644b04f6b036e63df6855d8307df6ee15..03bfd6bf580ba923c7666c40c57bc01b1e69e4bb 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'aaa-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'aaa-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,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-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 3352362c3ef98200046d34c4881ba987d49b5afc..e9e33f728e2c61d9e0a65b4768c4e85050d3fc7a 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -94,9 +94,9 @@
         - config-file-provider:
             files:
                 - file-id: '{autorelease-settings}'
-                  variable: 'AUTORELEASE_SETTINGS'
+                  variable: 'SETTINGS_FILE'
                 - file-id: '{odl-global-settings}'
-                  variable: 'ODL_GLOBAL_SETTINGS'
+                  variable: 'GLOBAL_SETTINGS_FILE'
 
 - builder:
     name: autorelease-maven-deploy
@@ -132,9 +132,9 @@
 - builder:
     name: autorelease-generate-release-patches
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-autorelease-release-versions.sh
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-release-versions.sh
 
 - builder:
     name: autorelease-sys-stats

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/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 9e3a833947d708c38d04586d67dd15f246538307..bc2591b757c77fdaf94c407cbb1e5186b3e3b154 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -75,7 +75,7 @@
 
     publishers:
     - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch'
+        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
index 500e0c417b9c15fc7aa0a7883c8f6f956995ff4d..a4b6deb6c8836aa4c183c7860a6a4a706133452a 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -10,7 +10,7 @@
 ##############################################################################
 
 NEXUSURL=http://nexus.opendaylight.org/content/repositories/
-VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
+VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
 REPOID=`grep "Closing staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 
 echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index ac21d5fcb36b6e5cca3669fb5bfffe4430d0b956..f9acf7c532da1a55ec69aac7c11ed95d16daf587 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -9,6 +9,15 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
+# Job will pass in a variable ${DATESTAMP} if this variable is false than we
+# we are likely releasing a release candidate. We should skip closing the
+# Nexus staging repository so that we can sign the artifacts.
+SKIP_STAGING_CLOSE=false
+if [ "${DATESTAMP}" == "false" ]
+then
+    SKIP_STAGING_CLOSE=true
+fi
+
 mkdir -p hide/from/pom/files
 cd hide/from/pom/files
 mkdir -p m2repo/org/opendaylight/
@@ -32,9 +41,10 @@ rsync -avz --exclude 'maven-metadata-local.xml' \
            "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
 
 mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
+    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE} \
     -DrepositoryDirectory="`pwd`/m2repo" \
     -DnexusUrl=http://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \
     -DserverId="opendaylight.staging" \
-    -s $AUTORELEASE_SETTINGS \
-    -gs $ODL_GLOBAL_SETTINGS | tee $WORKSPACE/deploy-staged-repository.log
+    -s $SETTINGS_FILE \
+    -gs $GLOBAL_SETTINGS_FILE | tee $WORKSPACE/deploy-staged-repository.log

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 99c40872a5be5d4091caea858ef52d3fcf71788b..1932859624856d598246123279cd41a40d74a7ef 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -26,6 +26,7 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
+mv taglist.log $PATCH_DIR
 modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
 for module in $modules; do
     pushd $module

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

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index ef6819bfb14481be15f6aadf40f28ceee4eb891c..7e0d223c58f75777723f4c0555b2517f2b74ecdf 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'capwap-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,6 +427,7 @@
 
 - job-template:
     name: 'capwap-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -486,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.yaml b/jjb/controller/controller.yaml
index cec33555f871ac207d79c27ff850117c491d1abf..4e8c3a2a060d0a0d53c395deae3d8d93f6134f3a 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'controller-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'controller-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,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.yaml b/jjb/didm/didm.yaml
index da621dc7ba9cad86b11c4cae2041afa94caa8e38..27fb23cc4598b118b48d2153f71bd508b4fb52c3 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'didm-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,6 +427,7 @@
 
 - job-template:
     name: 'didm-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -486,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.cfg b/jjb/dlux/dlux.cfg
index 98da554a410afa0ef92953dff905e08f3ccc7a1e..7bbe20d44bcb4632a8bff1b4cc87ec8fb9a370c8 100644 (file)
--- a/jjb/dlux/dlux.cfg
+++ b/jjb/dlux/dlux.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 0f425ccdd639f04069959462ea138d598801b6ed..c1cae938c021cb21d8329f86666626a1a3ecea55 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.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: 'dlux-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'dlux-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'dlux-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 964d6ae341e5df275f9fec7692f31c4c02297204..e358628b5968b7ba24e32887e41f19e0285d09b5 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'docs-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'docs-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,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.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 7f5e022d4c8505ccf5bc24d679f26bc7e00e2c2e..ee84d5dbd35323a280511754cc9c54e565530fe8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,6 +494,7 @@
 
 - job-template:
     name: 'groupbasedpolicy-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index eaa3cb5b2d5ae2a70feea3202a4dbbd5af5acb17..4ab3c842161376bc987bcc7d09fe754c40ce8c51 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -38,6 +38,7 @@
 
 - job-template:
     name: 'distribution-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -98,6 +99,7 @@
 
 - job-template:
     name: 'distribution-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c393b38dfe6fc0b0f4e76d845e87479d0a1b614f..888586cc3f8115dca637906561d585d94a08c68e 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
@@ -226,7 +230,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -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
@@ -505,7 +512,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -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 176c0d4aa196d71904cc1fd0aa06b442e1f32ae0..a572832523f36bc945c5cffbc591d2fb8a0a70b8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,7 +11,7 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -57,10 +57,13 @@
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
-                vpnservice-csit-1node-vpnservice-all-{stream}
+                vpnservice-csit-1node-vpnservice-all-{stream},
+                vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream}
 
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -106,10 +109,13 @@
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
-                vpnservice-csit-1node-vpnservice-all-{stream}
+                vpnservice-csit-1node-vpnservice-all-{stream},
+                vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -153,6 +159,7 @@
 
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
@@ -244,7 +251,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:

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.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 513997bd2b1ed81add2fa8aff48bb73ff49375a6..bb5d52921c5b909bdad46b236da745111490058d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'lispflowmapping-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'lispflowmapping-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'lispflowmapping-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 7fb888199a643ea26ad56c2f9c92b1e2844663fb..bde45ef7397be9bf40938131d0f0ad533faf5937 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'mdsal-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'mdsal-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'mdsal-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index ccff81660d3af9b80ed71a9ffd79f030bf704f3f..46e29f73ed943f99487b6cb959b23939cfc97cac 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'messaging4transport-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'messaging4transport-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'messaging4transport-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index a2c6cd121ee6ba4e63f6e8de5c769d7c4474c057..bb88a4bf7fc11d70594535ccf9669f20dd495feb 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'nemo-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'nemo-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'nemo-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index a819054a82427ec72aebb2ce1c37b4fe35767dac..806aca65998156de2ba1fbf3af9abe8ea2006f98 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'netconf-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'netconf-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'netconf-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index fa06590d7ee0e1e1754b3f92dc82ccca4326ad73..bfffc53878ea3889b5fe4cfb9ce7c0a5b365deba 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'netide-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'netide-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'netide-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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.cfg b/jjb/next/next.cfg
index 0708008fe4cfae32a5a3f3d8e6dafb9d5623dea3..ef67d88dad30e2a50b854374360262d50f8f91d8 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 225287d2f9c8e13b8ec761fa65418901adbfc4f3..e509e4666a30a949985aeb6c8cd9462e088d9643 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.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: 'next-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'next-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'next-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index c804da10b4893c627cb64a1ad9f17d1b1faa6ec1..a5d3fc5734bd35c9d8397dba922062e5959f13d5 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'nic-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,6 +427,7 @@
 
 - job-template:
     name: 'nic-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -486,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 61dc15c0e619efbe93121597b98f1ecf09063cc3..50d8c15bc57521b56f1aaa0a28ca14b110ac957a 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.cfg
+++ b/jjb/ofextensions/circuitsw/circuitsw.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 0a3242936a104858e1e935d967cd831343a67f5b..67672cfe2a4f9fc07e56770267ea52622b3e5b01 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.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: 'circuitsw-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +421,7 @@
 
 - job-template:
     name: 'circuitsw-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'circuitsw-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 0e5a08f94839251a8f1b2872ecd538730432edef..9e22c837f1954f3bbba4e9035c7ef1631a0784cf 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'openflowjava-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'openflowjava-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,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.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.yaml b/jjb/ovsdb/ovsdb.yaml
index 3943ef9c1671fa0ee326ac43062bc1677d288189..b696a8117b78aa57c3f2a0eab94ddd91b3722ae7 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -239,6 +239,7 @@
 
 - job-template:
     name: 'ovsdb-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -431,6 +432,7 @@
 
 - job-template:
     name: 'ovsdb-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index f34cb9d8b5825e9ab26de86b3cb7eca6d094242f..781a7f5d24531e653e626edb6ed92499ce808840 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.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: 'packetcable-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'packetcable-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,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.yaml b/jjb/reservation/reservation.yaml
index 4370b9b551efd203df0fe3c0119934209499245f..fa5fcfd0b610652e8d033ceac639025b30c9ef9b 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'reservation-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,6 +427,7 @@
 
 - job-template:
     name: 'reservation-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -486,6 +488,7 @@
 
 - job-template:
     name: 'reservation-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 144d6f63fd5dce9709ec6c169e15b6d264f41530..bb249efaf3b3846f2103921456280766fa3633fc 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.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: 'sdninterfaceapp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'sdninterfaceapp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a35ab2e4ff1dadacce89656b495d74bdd700a33d..8248f5c9e15966e226c40f6a19684c3eac642481 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.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: 'sfc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'sfc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,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.yaml b/jjb/sxp/sxp.yaml
index b924d1cf60c9d7fb69f07b139e15ffcba7d71f95..9f47c069d48bac816928a0d880ebffdecfc06cba 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'sxp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'sxp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,6 +494,7 @@
 
 - job-template:
     name: 'sxp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index fe0aa98835bd46b37d03078d3d65f9ba362e0c2b..6617e9ce8b57398de8d831efeb0d4a54e1642adb 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'tcpmd5-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +434,7 @@
 
 - job-template:
     name: 'tcpmd5-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,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.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 634afdaf0bbd665a7cc4af830d1e19c6e26357f9..8f4a6d35ce6bf345576251a1d15342889cfd2b1b 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -235,6 +235,7 @@
 
 - job-template:
     name: 'topoprocessing-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +428,7 @@
 
 - job-template:
     name: 'topoprocessing-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +489,7 @@
 
 - job-template:
     name: 'topoprocessing-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/tsdr/tsdr-csit-h2.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
similarity index 83%
rename from jjb/tsdr/tsdr-csit-h2.yaml
rename to jjb/tsdr/tsdr-csit-cassandra.yaml
index 2efed7aeaeb6daf04fc82569b829c1dcd2cf7550..81e17c8166d7d36f0a2ff496f66eb6d1a4e284ba 100644 (file)
--- a/jjb/tsdr/tsdr-csit-h2.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: tsdr-csit-h2
+    name: tsdr-csit-cassandra
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'
@@ -8,7 +8,7 @@
     project: 'tsdr'
 
     # The functionality under test to verify
-    functionality: 'h2-datastore'
+    functionality: 'cassandra-datastore'
 
     # Project branches
     stream:
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-all'
+    install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector'
 
     # Robot custom options
     robot-options: ' '

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

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index d422e4d1190f42009b7cea8da3d932710026f743..6fb8f65eabb19d138b22f740dbd755adbbf326f6 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.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: 'tsdr-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'tsdr-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'tsdr-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 262ec244161005b6682fe1bf2479edd36e98ba2f..f4519257fe00c4d07f262b7cd02230be62c1ff18 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'unimgr-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'unimgr-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'unimgr-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 5cdadb56dbc35e8f73a628b49ab917c49b72a411..15a1168a0ac71c9df64e9d6bc44ed6198eb64b1e 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.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: 'usc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +428,7 @@
 
 - job-template:
     name: 'usc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +489,7 @@
 
 - job-template:
     name: 'usc-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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

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.cfg b/jjb/vpnservice/vpnservice.cfg
index a8f6295a34ffd8b91570b33fc14b7f1a83df8151..36ecbdfd0143c88ff10f7875d6d3d0ca1b4fbe76 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 9d649c8109f47560fe65b352671f1e6ede3d38b3..adc704b0f6e87440124dcfc22e8bd9040c69ab6f 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.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: 'vpnservice-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,6 +427,7 @@
 
 - job-template:
     name: 'vpnservice-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'vpnservice-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index a97004c098918e6f03502709a9c31cdc51e64015..d3544de77168d9647b4fbc87b5b5de9e1e173ab5 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'vtn-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,6 +433,7 @@
 
 - job-template:
     name: 'vtn-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -492,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.yaml b/jjb/yang-push/yang-push.yaml
index 2b76b5b40f712fffa74c91db9a9ab1a464e965e8..2e3f416cbd374b2d8f29a62bde509b0a788a1016 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'yang-push-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,6 +421,7 @@
 
 - job-template:
     name: 'yang-push-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'yang-push-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify

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