Skip to content

Fix Republish Released Docker Images job #36954

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

Merged
Amar3tto merged 4 commits into from
Dec 3, 2025
Merged

Fix Republish Released Docker Images job #36954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40da98
Remove python 3.9
Amar3tto Dec 1, 2025
d137814
Add nvidia license
Amar3tto Dec 1, 2025
065a3ae
Upgrade pip-licenses
Amar3tto Dec 2, 2025
bfea1e3
Remove nvidia requirements
Amar3tto Dec 2, 2025
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
1 change: 0 additions & 1 deletion .github/workflows/build_release_candidate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ jobs:
# tasks as they are added.
images_to_publish: [
{"gradle_task": ":pushAllRunnersDockerImages", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push39", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push310", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push311", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push312", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/republish_released_docker_containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
# tasks as they are added.
images_to_publish: [
{"gradle_task": ":pushAllRunnersDockerImages", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push39", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push310", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push311", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
{"gradle_task": ":sdks:python:container:push312", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
Expand Down Expand Up @@ -93,6 +92,7 @@ jobs:
run: |
./gradlew ${{ matrix.images_to_publish.gradle_task }} \
-PisRelease \
-PpythonVersion=3.10 \
-Pdocker-pull-licenses \
-Pprune-images ${{ matrix.images_to_publish.include_skip_flags }} \
-Pdocker-repository-root=gcr.io/apache-beam-testing/updated_released_container_images \
Expand Down
8 changes: 4 additions & 4 deletions release/src/main/scripts/run_rc_validation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ HUB_VERSION=2.12.0
HUB_ARTIFACTS_NAME=hub-linux-amd64-${HUB_VERSION}
BACKUP_BASHRC=.bashrc_backup_$(date +"%Y%m%d%H%M%S")
BACKUP_M2=settings_backup_$(date +"%Y%m%d%H%M%S").xml
declare -a PYTHON_VERSIONS_TO_VALIDATE=("python3.9")
declare -a PYTHON_VERSIONS_TO_VALIDATE=("python3.10")
echo ""
echo "====================Checking Environment & Variables================="
echo "PLEASE update RC_VALIDATE_CONFIGS in file script.config first."
Expand Down Expand Up @@ -604,7 +604,7 @@ if [[ ("$python_xlang_quickstart" = true) \
PYTHON_MULTILANG_QUICKSTART_OUTPUT_FILE_NAME=${PYTHON_MULTILANG_QUICKSTART_FILE_PREFIX}_output
PYTHON_MULTILANG_QUICKSTART_EXPECTED_OUTPUT_FILE_NAME=${PYTHON_MULTILANG_QUICKSTART_FILE_PREFIX}_expected_output
PYTHON_MULTILANG_QUICKSTART_SORTED_OUTPUT_FILE_NAME=${PYTHON_MULTILANG_QUICKSTART_FILE_PREFIX}_sorted_output

# Cleaning up data from any previous runs.
rm ${PYTHON_MULTILANG_QUICKSTART_FILE_PREFIX}*
rm ./beam-examples-multi-language-${RELEASE_VER}.jar
Expand All @@ -624,7 +624,7 @@ if [[ ("$python_xlang_quickstart" = true) \
# Downloading the expansion service jar.
wget ${REPO_URL}/org/apache/beam/beam-examples-multi-language/${RELEASE_VER}/beam-examples-multi-language-${RELEASE_VER}.jar
JAVA_EXPANSION_SERVICE_PORT=33333

# Starting up the expansion service in a seperate shell.
echo "A new terminal will pop up and start a java expansion service."
gnome-terminal -x sh -c \
Expand Down Expand Up @@ -746,7 +746,7 @@ if [[ ("$java_xlang_quickstart" = true) \
--expansionService=localhost:${PYTHON_EXPANSION_SERVICE_PORT} \
--output=${JAVA_MULTILANG_QUICKSTART_OUTPUT_FILE_NAME}"

# We cannot validate local output since
# We cannot validate local output since
# TODO: Write output to GCS and validate when Python portable runner can forward credentials to GCS appropriately.

java_xlang_quickstart_status=$?
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ COPY target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/

COPY target/license_scripts /tmp/license_scripts/
RUN if [ "$pull_licenses" = "true" ] ; then \
pip install 'pip-licenses<5' pyyaml tenacity && \
pip install 'pip-licenses<6' pyyaml tenacity && \
python /tmp/license_scripts/pull_licenses_py.py ; \
fi

Expand Down
2 changes: 1 addition & 1 deletion sdks/python/expansion-service-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ COPY target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/

COPY target/license_scripts /tmp/license_scripts/
RUN if [ "$pull_licenses" = "true" ] ; then \
pip install 'pip-licenses<5' pyyaml tenacity && \
pip install 'pip-licenses<6' pyyaml tenacity && \
python /tmp/license_scripts/pull_licenses_py.py ; \
fi

Expand Down
Loading