-#!/bin/bash
+#!/bin/bash -l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv "git-review==1.28"
+
# Fail if branch cutting is not on master
if [ "$BRANCH_CUT" = "true" ] && [ "$BRANCH" != "master" ]; then
echo "ERROR: Cannot branch cut on $BRANCH, its required to be on the master branch."
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
-
-# Setup Gerrit remove to ensure Change-Id gets set on commit.
+# Setup Gerrit remote to ensure Change-Id gets set on commit.
git config --global --add gitreview.username "jenkins-$SILO"
git review -s
git remote -v
if [ "$BRANCH_CUT" = "false" ]; then
lftools version release "$RELEASE_TAG"
+ commit_msg="Bump versions by x.y.(z+1)"
+else
+ commit_msg="Bump versions by x.(y+1).z"
+ # If we are branch cutting we also need to bump the docs/conf.yaml version
+ find . -type f -name conf.yaml -exec sed -i "s/version:.*/version: ${STREAM^}/" {} \;
fi
lftools version bump "$RELEASE_TAG"
-git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
+# Ignore changes to Final distribution since that will be released separately
+pushd integration/distribution || true
+ git checkout -f opendaylight/pom.xml || true
+popd || true
+
+git submodule foreach "git commit -asm '${commit_msg}'"
# Only submodules need to be bumped, we can ignore autorelease's bump information
git checkout -f
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