From: Vratko Polak Date: Wed, 4 Oct 2017 10:59:47 +0000 (+0200) Subject: Remove traces of Boron logic X-Git-Tag: release/carbon-sr2~63 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=493cf226caf665a4dd999be9b2ebe3dc7b46584a;p=releng%2Fbuilder.git Remove traces of Boron logic + next-release-tag removal postponed to Carbon + csit-list-{stream}.inc instead listing all files + ovs-scm argument and git-opflex-ovs-v1 macro removed + git-opflex-ovs-v2 hardcoded for opflex openvswitch job + packaging VERSION_MAJOR not detecting boron - removed whole comment block for jobs needing only stream and branch + for other jobs, edited examples to nitrogen and oxygen - Comment for RELEASE_TAG kept with older tags - packaging DOWNLOAD_URL kept with Boron-SR2 URL, FIXME added + Comment on BGP *-all features removed (as they are no longer used) + CSIT verify overrides removed for Dluxapps and Iotdm + Other CSIT old branch comments removed Change-Id: I1431344cc5afd98e9e2c680ebaec0d3f3ea76dcb Signed-off-by: Vratko Polak --- diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 82d8c4c2c..46cbef590 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -10,7 +10,7 @@ build-node: centos7-java-builder-2c-8g - gerrit-tox-verify - # todo: After boron EOL remove next-release-tag and directy pass + # todo: After Carbon EOL remove next-release-tag and directy pass # '{stream}' to autorelease-release-tag parameter stream: - oxygen: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 732783b5a..693849af2 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -31,7 +31,6 @@ scope: 'all' # Features to install - # *-all is for Beryllium and Boron, without -all is for Boron and Carbon. install-features: > odl-restconf, odl-bgpcep-pcep, diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 3967efe5c..203bc1c8c 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -10,7 +10,6 @@ # The functionality under test functionality: 'akka1' - # Project branches. Boron for actual testing, Beryllium for sanity. stream: - oxygen: branch: 'master' diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index a6dcaaea9..32bea4c50 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -24,10 +24,6 @@ jre: 'openjdk8' karaf-version: karaf3 - # dluxapps started in Carbon project, so current verify with Boron is not working - verify-stream: 'carbon' - verify-branch: 'stable/carbon' - install: - all: scope: 'all' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index daf5de215..738628e9b 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -390,8 +390,7 @@ # This job's purpose is to update csit # tests to run in integration-distribution-test-{stream} - # by updating integration files: csit-list-carbon.inc, - # csit-list-boron.inc, csit-list-beryllium.inc + # by updating integration files: csit-list-{stream}.inc # These files can be used as !include in int-dist-test-{stream} ###################### diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 707f2d6e6..6c4547b03 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -13,10 +13,6 @@ # Project branches stream: - # Removed jobs testing Beryllium and Boron branches due to - # backward incompatible changes in test suites for Carbon - # TODO: Create test suites for specific release before - # Carbon if needed. - oxygen: branch: 'master' jre: 'openjdk8' @@ -28,12 +24,6 @@ jre: 'openjdk8' karaf-version: karaf3 - # TODO: Delete the following if suites are compatible with Boron again. - verify-stream: 'carbon' - # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream. - verify-branch: 'master' - # TODO: Update the line above when stable/carbon is created. - install: - all: scope: 'all' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index fb2493873..b018bb00a 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -10,7 +10,6 @@ # The functionality under test functionality: 'bindingv1' - # Project branches. Boron for actual testing, Beryllium for sanity. stream: - oxygen: branch: 'master' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index 2d2e0aaf2..0f397673b 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -6,26 +6,22 @@ - 'opflex-rapidjson-{stream}' - 'opflex-openvswitch-{stream}' - # todo: remove 'ovs-scm' after boron EOL stream: - oxygen: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - ovs-scm: v2 - nitrogen: branch: 'stable/nitrogen' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - ovs-scm: v2 - carbon: branch: 'stable/carbon' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - ovs-scm: v2 project: 'opflex' @@ -179,7 +175,7 @@ description: 'openvswitch-version' scm: - - git-opflex-ovs-{ovs-scm} + - git-opflex-ovs-v2 wrappers: - opendaylight-infra-wrappers: diff --git a/jjb/opflex/opflex-macros.yaml b/jjb/opflex/opflex-macros.yaml index 44ebfef35..c1dfa113d 100644 --- a/jjb/opflex/opflex-macros.yaml +++ b/jjb/opflex/opflex-macros.yaml @@ -94,16 +94,6 @@ - 'refs/tags/v$OPENVSWITCH_VERSION' wipe-workspace: true -# todo: remove 'git-opflex-ovs-v1' after boron EOL -- scm: - name: 'git-opflex-ovs-v1' - scm: - - git: - url: https://github.com/noironetworks/ovs.git - branches: - - 'origin/noiro' - wipe-workspace: true - - scm: name: 'git-opflex-rapidjson' scm: diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index b981c707b..1518f22bb 100644 --- a/jjb/packaging/build-rpm-snap.sh +++ b/jjb/packaging/build-rpm-snap.sh @@ -19,9 +19,7 @@ $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt" STREAM=${{JOB_NAME##*-}} # Convert stream to numeric ODL major version -if [ "$STREAM" == "boron" ]; then - VERSION_MAJOR=5 -elif [ "$STREAM" == "carbon" ]; then +if [ "$STREAM" == "carbon" ]; then VERSION_MAJOR=6 elif [ "$STREAM" == "nitrogen" ]; then VERSION_MAJOR=7 diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 41d81dbfd..83c2c629a 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -359,6 +359,7 @@ staging-profile-id: '' - string: name: DOWNLOAD_URL + # FIXME: Update the default value to an active stream. # yamllint disable-line rule:line-length default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz' description: 'URL to ODL tarball artifact to repackage into .deb' diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 9b0da3c32..a0efd78a9 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -67,16 +67,6 @@ - job-template: name: '{project-name}-integration-{stream}' - # Job template for ODL integration verify jobs - # - # This is similar to a normal verify job, but it runs - # when a project that's a dependency of your project - # is successfully built. - # - # Required Variables: - # stream: release stream (eg. boron or carbon) - # branch: git branch (eg. stable/boron or master) - project-type: freestyle node: '{build-node}' jdk: '{jdk}' @@ -135,15 +125,6 @@ - job-template: name: '{project-name}-merge-{stream}' - # Job template for ODL merge jobs - # - # The purpose of this job template is to setup a ODL merge job - # and deploy artifacts to Nexus. - # - # Required Variables: - # 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 # separate lifecycle: @@ -329,14 +310,6 @@ - job-template: name: '{project-name}-verify-{stream}-{maven}-{jdks}' - # Job template for ODL verify jobs - # - # The purpose of this job template is to setup a ODL verify job - # - # Required Variables: - # stream: release stream (eg. boron or carbon) - # branch: git branch (eg. stable/boron or master) - project-type: freestyle node: '{build-node}' concurrent: true diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index c4bf31156..18ae3c723 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -123,7 +123,7 @@ name: tox_builder_verify # Required Variables: - # branch: git branch (eg. stable/boron or master) + # branch: git branch (eg. stable/nitrogen or master) # toxdir: directory containing the project's tox.ini relative to # the workspace. Empty works if tox.ini is at project root. # Note that stream value is not needed. @@ -293,8 +293,8 @@ # virtualenv for nodejs. # # Required Variables: - # stream: release stream (eg. boron or carbon) - # branch: git branch (eg. stable/boron or master) + # stream: release stream (eg. nitrogen or oxygen) + # branch: git branch (eg. stable/nitrogen or master) # nodedir: directory of nodejs project to run node test against # nodever: version of node to install in virtualenv diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index d8dc40cf3..1e091f525 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -4,8 +4,6 @@ jobs: - 'sfc-verify-python-{stream}' - # stream: release stream (eg. stable-boron or beryllium) - # branch: git branch (eg. stable/boron or master) stream: - oxygen: branch: 'master' @@ -21,14 +19,6 @@ - job-template: name: 'sfc-verify-python-{stream}' - # Job template for ODL verify jobs - # - # The purpose of this job template is to setup a ODL verify job - # - # Required Variables: - # stream: release stream (eg. stable-boron or beryllium) - # branch: git branch (eg. stable/boron or master) - project-type: freestyle node: centos7-java-builder-2c-8g concurrent: true