From 3d75199a3460d7bd68e07b53bf364da4168705e2 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 3 May 2018 13:15:26 +1000 Subject: [PATCH] Remove all refs to carbon from AR jobs Ref: https://meetings.opendaylight.org/opendaylight-meeting/2018/tsc/opendaylight-meeting-tsc.2018-04-26-16.59.html Change-Id: I1f7ea073725ef38849ade56e4a600b7d00df69e2 Signed-off-by: Anil Belur --- jjb/autorelease/autorelease-projects.yaml | 5 ----- jjb/autorelease/autorelease-templates.yaml | 4 ++-- jjb/autorelease/compare-autorelease-projects.sh | 4 ++-- jjb/autorelease/prepare-release.sh | 13 ++----------- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 4c8bef7b4..4873455ff 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -12,23 +12,18 @@ - '{project-name}-validate-autorelease-{stream}' - gerrit-tox-verify - # todo: After Carbon EOL remove next-release-tag and directy pass - # '{stream}' to autorelease-release-tag parameter stream: - fluorine: - next-release-tag: '{stream}' branch: 'master' integration-test: fluorine extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - oxygen: # Run once a week (Sunday) until Nitrogen-SR3 is out. cron: 'H 12 * * 6' - next-release-tag: '{stream}' branch: 'stable/oxygen' integration-test: oxygen extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - nitrogen: - next-release-tag: '{stream}' branch: 'stable/nitrogen' integration-test: nitrogen extra-mvn-opts: -P!karaf -Dsft.heap.max=4g diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 4c65c5b80..ffff6f112 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -87,7 +87,7 @@ - distribution-karaf-version: karaf-version: '{karaf-version}' - autorelease-release-tag: - release-tag: '{next-release-tag}' + release-tag: '{stream}' - string: name: EXTRA_MVN_OPTS default: '{extra-mvn-opts}' @@ -299,7 +299,7 @@ lftools-version: '{lftools-version}' - string: name: RELEASE_TAG - default: '{next-release-tag}' + default: '{stream}' description: | Release that is being version bumped. Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2... diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh index dfcd933ff..9458429a7 100644 --- a/jjb/autorelease/compare-autorelease-projects.sh +++ b/jjb/autorelease/compare-autorelease-projects.sh @@ -16,8 +16,8 @@ echo "---> compare-autorelease-projects.sh" # are equal to the list of projects in integration/distribution. # Note: int/dist pom files uses templates only since Oxygen release. -# Todo: Remove this check after Carbon and Nitrogen EOL -if [[ $STREAM =~ carbon ]] || [[ $STREAM =~ nitrogen ]]; then +# Todo: Remove this check after Nitrogen EOL +if [[ $STREAM =~ nitrogen ]]; then exit 0 fi diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh index ca3174cb5..a2b8abc3d 100644 --- a/jjb/autorelease/prepare-release.sh +++ b/jjb/autorelease/prepare-release.sh @@ -37,17 +37,8 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG | tee -a $PATCH_DIR/taglist.log" echo "$RELEASE_TAG" -# Remove this case statement when Carbon is no longer supported. -# Nitrogen onwards we do not want to use the release tag so simply need to -# strip xml files of -SNAPSHOT tags. -case "$RELEASE_TAG" in - Carbon*) - lftools version release "$RELEASE_TAG" - ;; - *) - find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//' - ;; -esac +find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//' + git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true" git commit -am "Release $RELEASE_TAG" -- 2.36.6