From: Thanh Ha Date: Thu, 13 Oct 2016 03:29:04 +0000 (+0000) Subject: Merge "Purge un-needed references to lithium stream" X-Git-Tag: release/beryllium-sr4~25 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e37e75ec6759746119c04393671b757f027772f0;hp=c695d3d5ba767c43e930a09983ef969c41ce5396;p=releng%2Fbuilder.git Merge "Purge un-needed references to lithium stream" --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 2910fc458..74173b605 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index fce3c8328..abed9375a 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index 3a79cda7f..dc90f9bd1 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -46,8 +44,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True @@ -82,8 +78,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: True diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index ba6528d8b..887f21093 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True 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 3f4658289..67564700c 100644 --- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh +++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh @@ -11,12 +11,7 @@ NEXUSURL=https://nexus.opendaylight.org/content/repositories/ VERSION=`grep -m2 '' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }'` -if [ "x${VERSION}" == "x" ]; then - echo "Lithium or sooner, different path needs to be searched." - VERSION=`grep -m1 '' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'` -fi echo "VERSION: ${VERSION}" REPOID=`grep "Created 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 echo "BUNDLEURL: ${BUNDLEURL}" diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index c64377e91..7d4c346ea 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -29,7 +29,7 @@ scope: 'all' # Features to install - # *-all is for Lithium and Beryllium, without -all is for Lithium and Boron. + # *-all is for Beryllium and Boron, without -all is for Boron and Carbon. install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia' # Robot custom options diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml index 128dbb3fe..3114166ad 100644 --- a/jjb/bgpcep/bgpcep-pcepy.yaml +++ b/jjb/bgpcep/bgpcep-pcepy.yaml @@ -3,8 +3,6 @@ jobs: - '{project-name}-verify-python-{stream}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: branch: 'master' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 7bd3ae1d5..db194e26a 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -46,8 +44,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -83,8 +79,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index cd35bad16..0a04159b5 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 6a53e4d0e..cd5adb204 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index ce19225cb..31819d38b 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 57803dfd5..d90e0f37f 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index a31a321f4..4bacf39c5 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: True diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index e441b5aa8..d70f316fd 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml index bf619dc2b..d33b90efd 100644 --- a/jjb/discovery/discovery.yaml +++ b/jjb/discovery/discovery.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 9b8f0ef1e..5089b6dbb 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml index 806df16ff..7a24b7cdb 100644 --- a/jjb/docs/docs.yaml +++ b/jjb/docs/docs.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 40f305822..92e6bf380 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index c58cd5e9e..130dfa829 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 8ad77d044..6aa95ac66 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index b64299988..185b7d611 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index aad3e73c9..b763cabf1 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 9aa168149..f63617734 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index b19b53ad5..100acd9e9 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -6,8 +6,6 @@ - '{project-name}-sonar' - '{project-name}-validate-autorelease-{stream}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: branch: 'master' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index d715ce755..29720ac9f 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index cede29eda..d93c4f133 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index fbf946375..73bfc5493 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 014190ceb..ff3a59d12 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 70b99b1f7..293ac4c48 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index ab0fa13f5..74a749bae 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index f0fe58f41..4a07d7cbb 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 509fa5ced..e63199fdb 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 6281faa03..964c45816 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index ff5747f20..803a4e784 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/netvirt/include-raw-openstack-ci.sh b/jjb/netvirt/include-raw-openstack-ci.sh index 9e9ff8fcb..9f5f2ac7a 100644 --- a/jjb/netvirt/include-raw-openstack-ci.sh +++ b/jjb/netvirt/include-raw-openstack-ci.sh @@ -83,8 +83,6 @@ fi # Use specific build, if asked to do so if [ "${ODL_VERSION}" == "beryllium" ] ; then DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=beryllium-snapshot-0.4.0;" -elif [ "${ODL_VERSION}" == "lithium" ] ; then - DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot-0.3.1;" fi # And this runs devstack-gate diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 53fcce297..6dbaeda2b 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -3,8 +3,6 @@ jobs: - 'netvirt-daily-full-integration-{stream}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: branch: 'master' @@ -138,10 +136,6 @@ - job-template: name: 'netvirt-daily-full-integration-{stream}' - # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - project-type: freestyle node: centos7-docker-2c-4g jdk: '{jdk}' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 807f0d535..e127d98d5 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh index f633a6980..46ff626fe 100644 --- a/jjb/neutron/include-raw-openstack-ci.sh +++ b/jjb/neutron/include-raw-openstack-ci.sh @@ -82,6 +82,7 @@ fi # Use specific build, if asked to do so if [ "${ODL_VERSION}" == "lithium-latest" ] ; then + # FIXME: Support more recent ODL release versions. DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot;" fi diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml index e56d5cb02..f2da9c918 100644 --- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml +++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml @@ -37,6 +37,7 @@ builders: - inject: properties-content: | + # FIXME: Should *-beryllium job set lithium version? Add a comment why. ODL_VERSION=lithium-latest TEMPEST_REGEX=tempest.api.network KARAFFEATURE=odl-neutron-dummyprovider-test diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 59b8c8aea..4d02e8854 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 5fbed269f..856c4da5e 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 610b433ba..9769ae52c 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 58c3370d1..6be6a380b 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index c157d14dd..5bcd0d522 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index cca9d8024..b78cc10f2 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 99d9f5e15..be9a10966 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 12c33b7bf..054a45224 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 27e4e37ff..26ff58d21 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 9f3d699a5..205558f39 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,8 +6,6 @@ # - 'opflex-daily-{stream}' # - 'opflex-distribution-{stream}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: branch: 'master' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 7fe777dc1..f90f0e8cc 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -3,8 +3,6 @@ jobs: - 'ovsdb-daily-full-integration-{stream}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: branch: 'master' @@ -105,10 +103,6 @@ - job-template: name: 'ovsdb-daily-full-integration-{stream}' - # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - project-type: freestyle node: centos7-docker-2c-4g jdk: '{jdk}' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 428425aa1..5f5e24ba0 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -80,8 +76,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index a73ac9693..9d35ca7f3 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 531ee28e8..93bbd7c59 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 4930d7136..a0ac7c956 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -63,8 +63,8 @@ name: '{project-name}-distribution-{stream}' # Required variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) # Need to keep jobs that deploy to Nexus at end of build as Maven # projects. Maybe reconsider this once upstream moves deploy to a @@ -243,8 +243,8 @@ # is successfully built. # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) project-type: freestyle node: '{build-node}' @@ -309,8 +309,8 @@ # and deploy artifacts to Nexus. # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) # Need to keep jobs that deploy to Nexus at end of build as Maven # projects. Maybe reconsider this once upstream moves deploy to a @@ -421,8 +421,8 @@ # builder. # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) project-type: freestyle node: '{build-node}' @@ -651,8 +651,8 @@ # The purpose of this job template is to setup a ODL verify job # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) project-type: freestyle node: '{build-node}' diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index 1313166fd..1539ba1bb 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -119,8 +119,8 @@ # template. # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) # toxdir: directory containing the project's tox.ini relative to # the workspace. Empty works if tox.ini is at project root. @@ -241,8 +241,8 @@ # virtualenv for nodejs. # # Required Variables: - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) + # stream: release stream (eg. boron or carbon) + # branch: git branch (eg. stable/boron or master) # nodedir: directory of nodejs project to run node test against # nodever: version of node to install in virtualenv diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 26f1a3741..796f017e6 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 31a1a1d46..2c13489db 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 8eb15b688..bd42051f3 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 527ca9a63..c69f7dd13 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 74fb6a8e6..90a8c3dfa 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 46df7cfc3..e2ee77094 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index fbaeb0699..3484bc91a 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 83547537c..0646bb162 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 293709539..f1ebe4cb7 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 3206832a3..047189f0e 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index fdb871b5c..2eced7b21 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index e48a52662..368208a0d 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 3ed7bc179..36ffa186d 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml index 799942d8b..61c86e5ba 100644 --- a/jjb/vpnservice/vpnservice.yaml +++ b/jjb/vpnservice/vpnservice.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -78,8 +74,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index f16dab708..b63ab541e 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -48,8 +46,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -85,8 +81,6 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 68fb7ce2a..ce38a9223 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -44,8 +42,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False @@ -78,8 +74,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - beryllium: disable_autorelease: False diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 1d43faf6b..0cbc00591 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: True @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: True diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index a2472d992..03eb6ae9f 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -10,8 +10,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - carbon: disable_autorelease: False @@ -45,8 +43,6 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) stream: - boron: disable_autorelease: False