From c35a108efde9185acf51c01f2d6283ecca5bd00c Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 12 May 2018 10:53:51 +1000 Subject: [PATCH] Remove nitrogen branches in autorelease Ref: https://meetings.opendaylight.org/opendaylight-meeting/2018/tsc/opendaylight-meeting-tsc.2018-04-26-16.59.html Change-Id: Ia8d6200d60d069ad8ec5eb96f876ffbd8c4f7fe2 Signed-off-by: Anil Belur --- jjb/autorelease/autorelease-projects.yaml | 6 -- .../autorelease-version-management.yaml | 2 - .../compare-autorelease-projects.sh | 6 -- jjb/autorelease/prepare-release.sh | 7 +- .../validate-autorelease-nitrogen.yaml | 87 ------------------- jjb/autorelease/version-bump.sh | 17 +--- 6 files changed, 4 insertions(+), 121 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-nitrogen.yaml diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 4873455ff..877dc08d1 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -18,15 +18,9 @@ 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' branch: 'stable/oxygen' integration-test: oxygen extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - - nitrogen: - branch: 'stable/nitrogen' - integration-test: nitrogen - extra-mvn-opts: -P!karaf -Dsft.heap.max=4g project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 65d731b4a..5c5df61e9 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -15,5 +15,3 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh index 9458429a7..0984d01f7 100644 --- a/jjb/autorelease/compare-autorelease-projects.sh +++ b/jjb/autorelease/compare-autorelease-projects.sh @@ -15,12 +15,6 @@ echo "---> compare-autorelease-projects.sh" # The purpose of this script is to compare list of projects in autorelease # 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 Nitrogen EOL -if [[ $STREAM =~ nitrogen ]]; then - exit 0 -fi - mapfile -t PROJECTS_INT_DIST < <(xmlstarlet sel\ -N "x=http://maven.apache.org/POM/4.0.0"\ -t -m "/x:project/x:profiles/x:profile[x:activation/x:activeByDefault='true']/x:dependencies/x:dependency/x:groupId"\ diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh index a2b8abc3d..b20b845fe 100644 --- a/jjb/autorelease/prepare-release.sh +++ b/jjb/autorelease/prepare-release.sh @@ -45,12 +45,7 @@ git commit -am "Release $RELEASE_TAG" 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" || exit - # TODO: Remove once stable/nitrogen is no longer supported. - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch" - else - git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch" - fi + git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch" git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD" popd || exit done diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml deleted file mode 100644 index b388684d9..000000000 --- a/jjb/autorelease/validate-autorelease-nitrogen.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-nitrogen - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: nitrogen - branch: stable/nitrogen - project-name: - - aaa: - project: aaa - - alto: - project: alto - - bgpcep: - project: bgpcep - - bier: - project: bier - - cardinal: - project: cardinal - - controller: - project: controller - - coe: - project: coe - - daexim: - project: daexim - - dlux: - project: dlux - - dluxapps: - project: dluxapps - - eman: - project: eman - - faas: - project: faas - - genius: - project: genius - - groupbasedpolicy: - project: groupbasedpolicy - - honeycomb-vbd: - project: honeycomb/vbd - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - l2switch: - project: l2switch - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - nemo: - project: nemo - - netconf: - project: netconf - - netvirt: - project: netvirt - - neutron: - project: neutron - - nic: - project: nic - - ocpplugin: - project: ocpplugin - - of-config: - project: of-config - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - packetcable: - project: packetcable - - sfc: - project: sfc - - snmp: - project: snmp - - snmp4sdn: - project: snmp4sdn - - sxp: - project: sxp - - topoprocessing: - project: topoprocessing - - ttp: - project: ttp - - unimgr: - project: unimgr - - usc: - project: usc - - yangtools: - project: yangtools diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 54bd1203f..d48b49070 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -35,15 +35,10 @@ fi if [ "$BRANCH_CUT" = "false" ]; then git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" - # TODO: Simplify once stable/nitrogen is no longer supported. for module in $(git submodule | awk '{ print $2 }') do pushd "$module" - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git checkout -b "v1.2.x" "origin/v1.2.x" - else - git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" - fi + git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" popd done fi @@ -73,14 +68,8 @@ mkdir -p "$patch_dir" for module in $(git submodule | awk '{ print $2 }') do pushd "$module" - # TODO: Remove once stable/nitrogen is no longer supported. - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch" - git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD" - else - git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" - git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD" - fi + git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" + git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD" popd done -- 2.36.6