Skip to content

Commit

Permalink
Fix distroless workflows (apache#33637)
Browse files Browse the repository at this point in the history
* Fix validatesDistrolessContainer

* Set java version

* fix java-version
  • Loading branch information
damondouglas authored Jan 17, 2025
1 parent f199cf0 commit a600af0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ jobs:
with:
gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTest
max-workers: 12
- name: Setup Java 17 environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 17
- name: run PostCommit Java Distroless Examples Dataflow V2 script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
17 changes: 1 addition & 16 deletions sdks/python/test-suites/dataflow/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -381,22 +381,7 @@ task validatesContainer() {
}

task validatesDistrolessContainer() {
def pyversion = "${project.ext.pythonVersion.replace('.', '')}"
dependsOn ":sdks:python:container:distroless:py${pyversion}:dockerPush"

def name = project.docker_image_default_repo_prefix + "python${project.ext.pythonVersion}_sdk_distroless"

def root = project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] :
project.docker_image_default_repo_root

def tag = project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project.sdk_version

def imageURL = containerImageName(
name: name,
root: root,
tag: tag)
def imageURL = "gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk_distroless:${project.sdk_version}"

doLast {
exec {
Expand Down

0 comments on commit a600af0

Please sign in to comment.