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 <abelur@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 4c8bef7b4f68758e4fcfb2b4b5922fa7f6ed8bcb..4873455ff893e1b228646b2b0b5941a2eec8e765 100644 (file)
--- 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 4c65c5b8078124993d33feb693119add6dd5f9e2..ffff6f112f0d15d15b16bf9701cfda2ac9f452bc 100644 (file)
--- 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 dfcd933ffccc391683a234c96bd7f67629275135..9458429a760395c70ed05fe6f699ce9017f4f2ae 100644 (file)
--- 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 ca3174cb56044c0237d47977ca1670cfc703e96e..a2b8abc3dc93694b2bb5e36cfd220a2c0acc0ef3 100644 (file)
--- 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"