Skip to content

Fix tests affected by Java 8 container turn down #35145

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
liferoad merged 2 commits into from
Jun 3, 2025
Merged

Fix tests affected by Java 8 container turn down #35145

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
8971e20
Fix tests affected by Java 8 container turn down
Abacn Jun 3, 2025
eb59efb
still use Java 8 for Samza runner
Abacn Jun 3, 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
6 changes: 4 additions & 2 deletions .github/workflows/beam_PostCommit_Go_VR_Samza.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ jobs:
uses: ./.github/actions/setup-environment-action
# TODO(https://github.com/apache/beam/issues/32208) move to Java11 after bump to Samza 1.8
with:
java-version: 8
java-version: |
11
8
- name: run Go Samza ValidatesRunner script
env:
CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :sdks:go:test:samzaValidatesRunner
gradle-command: :sdks:go:test:samzaValidatesRunner -Pjava11Home=$JAVA_HOME_11_X64
6 changes: 2 additions & 4 deletions runners/google-cloud-dataflow-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,8 @@ tasks.register('buildAndPushDistrolessContainerImage', Task.class) {
// task directly ('dependsOn buildAndPushDockerJavaContainer'). This ensures the correct
// task ordering such that the registry doesn't get cleaned up prior to task completion.
def buildAndPushDockerJavaContainer = tasks.register("buildAndPushDockerJavaContainer") {
def javaVer = getSupportedJavaVersion()
if(project.hasProperty('testJavaVersion')) {
javaVer = "java${project.getProperty('testJavaVersion')}"
}
def javaVer = getSupportedJavaVersion(project.findProperty('testJavaVersion') as String)

dependsOn ":sdks:java:container:${javaVer}:docker"
def defaultDockerImageName = containerImageName(
name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk",
Expand Down
Loading