Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check whether or not jenkins folder exists in backport branches #9280

Merged
merged 4 commits into from
Mar 6, 2024
Merged

Check whether or not jenkins folder exists in backport branches #9280

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d68fdae
Check whether or not jenkins folder exists
mrodm Mar 6, 2024
ae39aaa
Add status command
mrodm Mar 6, 2024
1d9a1d2
Check if there are files in stage before git commit
mrodm Mar 6, 2024
c942c13
Add dry_run tag in annotation
mrodm Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions .buildkite/scripts/backport_branch.sh
View file
Open in desktop
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
Comment on lines +112 to +125
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run these steps also in DRY_RUN=true mode.


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