Skip to content

Fix Post Commit Transform Service #36799

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
Abacn merged 2 commits into from
Nov 12, 2025
Merged

Fix Post Commit Transform Service #36799

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
23197bb
Fixed transform service Python container to match test Python version
aIbrahiim Nov 12, 2025
6842489
Fix transform service container Python version
aIbrahiim Nov 12, 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
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3004,7 +3004,7 @@ class BeamModulePlugin implements Plugin<Project> {

// Transform service delivers transforms that refer to SDK harness containers with following sufixes.
def transformServiceJavaContainerSuffix = 'java11'
def transformServicePythonContainerSuffix = '310'
def transformServicePythonContainerSuffix = pythonContainerSuffix

def setupTask = project.tasks.register(config.name+"Setup", Exec) {
// Containers for main SDKs when running tests.
Expand Down
3 changes: 2 additions & 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 @@ -18,7 +18,8 @@

# We just need to support one Python version supported by Beam.
# Picking the current default Beam Python version which is Python 3.10.
FROM python:3.10-bookworm as expansion-service
ARG py_version=3.10
FROM python:${py_version}-bookworm as expansion-service
LABEL Author "Apache Beam <[email protected]>"
ARG TARGETOS
ARG TARGETARCH
Expand Down
4 changes: 3 additions & 1 deletion sdks/python/expansion-service-container/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ task copyDockerfileDependencies(type: Copy) {
}

task copyRequirementsFile(type: Copy) {
from project(':sdks:python:container:py39').fileTree("./")
def pythonVersionSuffix = project.ext.pythonVersion.replace('.', '')
from project(":sdks:python:container:py${pythonVersionSuffix}").fileTree("./")
include 'base_image_requirements.txt'
rename 'base_image_requirements.txt', 'requirements.txt'
setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
Expand Down Expand Up @@ -70,6 +71,7 @@ docker {
// tags used by dockerTag task
tags containerImageTags()
files "./build"
buildArgs(['py_version': "${project.ext.pythonVersion}"])
buildx project.useBuildx()
platform(*project.containerPlatforms())
load project.useBuildx() && !pushContainers
Expand Down
Loading