Skip to content

Commit

Permalink
Check whether or not jenkins folder exists in backport branches (#9280)
Browse files Browse the repository at this point in the history
Add safeguards when running backport branches pipeline, to avoid
errors if ".ci" (jenkins folder) does not exist or if there are no changes
in the stage.
  • Loading branch information
mrodm authored Mar 6, 2024
1 parent 4efd950 commit f0b47d0
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions .buildkite/scripts/backport_branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ removeOtherPackages() {
updateBackportBranchContents() {
local BUILDKITE_FOLDER_PATH=".buildkite"
local JENKINS_FOLDER_PATH=".ci"
local files_cached_num=""
if git ls-tree -d --name-only main:.ci >/dev/null 2>&1; then
git checkout $BACKPORT_BRANCH_NAME
echo "Copying $BUILDKITE_FOLDER_PATH from $SOURCE_BRANCH..."
Expand All @@ -108,15 +109,26 @@ updateBackportBranchContents() {
git config --global user.name "${GITHUB_USERNAME_SECRET}"
git config --global user.email "${GITHUB_EMAIL_SECRET}"

echo "Commiting"
git add $BUILDKITE_FOLDER_PATH
if [ -d "${JENKINS_FOLDER_PATH}" ]; then
git add $JENKINS_FOLDER_PATH
fi
git add $PACKAGES_FOLDER_PATH/
git status

files_cached_num=$(git diff --name-only --cached | wc -l)
if [ "${files_cached_num}" -gt 0 ]; then
git commit -m "Add $BUILDKITE_FOLDER_PATH and $JENKINS_FOLDER_PATH to backport branch: $BACKPORT_BRANCH_NAME from the $SOURCE_BRANCH branch"
else
echo "Nothing to commit, skip."
fi

if [ "$DRY_RUN" == "true" ];then
echo "DRY_RUN mode, nothing will be pushed."
git diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
else
echo "Commiting and pushing..."
git add $BUILDKITE_FOLDER_PATH
git add $JENKINS_FOLDER_PATH
git add $PACKAGES_FOLDER_PATH/
git commit -m "Add $BUILDKITE_FOLDER_PATH and $JENKINS_FOLDER_PATH to backport branch: $BACKPORT_BRANCH_NAME from the $SOURCE_BRANCH branch"
echo "Pushing..."
git push origin $BACKPORT_BRANCH_NAME
fi
}
Expand Down Expand Up @@ -172,4 +184,7 @@ MSG="The backport branch: **$BACKPORT_BRANCH_NAME** has been created."
echo "Adding CI files into the branch ${BACKPORT_BRANCH_NAME}"
updateBackportBranchContents

if [ "${DRY_RUN}" == "true" ]; then
MSG="[DRY_RUN] ${MSG}."
fi
buildkite-agent annotate "$MSG" --style "success"

0 comments on commit f0b47d0

Please sign in to comment.