Skip to content

SCHED-737: Include PR number in merge-back branch name to avoid collisions #2021

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

Open
theyoprst wants to merge 2 commits into
base: soperator-release-1.23
Choose a base branch
from
+12 −6
Open

SCHED-737: Include PR number in merge-back branch name to avoid collisions #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9806398
SCHED-737: Include PR number in merge-back branch name to avoid colli…
theyoprst Jan 12, 2026
8fb0385
Up Python package versions from Dockerfiles
theyoprst Jan 13, 2026
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
8 changes: 7 additions & 1 deletion .github/workflows/scripts/auto-merge-back.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ create_merge_branch() {

# Use original PR branch name if available, otherwise use release branch with SHA
if [ -n "${PR_HEAD_REF}" ]; then
NEW_BRANCH="merge-to-main-from/${PR_HEAD_REF}"
NEW_BRANCH="merge-to-main-from/pr-${PR_NUMBER}/${PR_HEAD_REF}"
else
NEW_BRANCH="merge-to-main-from/${RELEASE_BRANCH}-${COMMIT_SHORT_SHA}"
fi
Expand Down Expand Up @@ -157,6 +157,12 @@ ${COMMIT_MESSAGE}
}

main() {
# Skip re-runs to avoid duplicate PR creation attempts
if [ "${GITHUB_RUN_ATTEMPT:-1}" -gt 1 ]; then
echo "Skipping re-run (attempt ${GITHUB_RUN_ATTEMPT}). Merge-back PRs should only be created on first run."
exit 0
fi

get_commit_info
get_github_username
get_pr_info
Expand Down
4 changes: 2 additions & 2 deletions images/jail/jail.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ RUN chmod 644 /etc/passwd /etc/group && chown 0:0 /etc/passwd /etc/group && \
# Install minimal python packages for Ansible
RUN apt-get update && \
apt-get install -y \
python3.12="3.12.3-1ubuntu0.9" \
python3.12-venv="3.12.3-1ubuntu0.9"
python3.12="3.12.3-1ubuntu0.10" \
python3.12-venv="3.12.3-1ubuntu0.10"

# Install Ansible and base configs
COPY ansible/ansible.cfg ansible/requirements.txt ansible/run.yml /opt/ansible/
Expand Down
6 changes: 3 additions & 3 deletions images/k8s_check_job/k8s_check_job.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ RUN chmod +x /opt/bin/install_kubectl.sh && \
# Install python
RUN apt-get update && \
apt-get install -y \
python3.12="3.12.3-1ubuntu0.9" \
python3.12-dev="3.12.3-1ubuntu0.9" \
python3.12-venv="3.12.3-1ubuntu0.9" \
python3.12="3.12.3-1ubuntu0.10" \
python3.12-dev="3.12.3-1ubuntu0.10" \
python3.12-venv="3.12.3-1ubuntu0.10" \
python3-pip="24.0+dfsg-1ubuntu1.3" \
python3-pip-whl="24.0+dfsg-1ubuntu1.3" && \
apt-get clean && \
Expand Down
Loading