Skip to content

Commit

Permalink
Merge pull request apache#14742 [BEAM-12296] Fix bug in :sdks:go:test…
Browse files Browse the repository at this point in the history
…:ulrValidatesRunner
  • Loading branch information
robertwb committed May 6, 2021
2 parents ae3525b + 7660520 commit 31b351b
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions sdks/go/test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@ task sparkValidatesRunner {
}
}

def javaContainerSuffix
if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
javaContainerSuffix = 'java8'
} else if (JavaVersion.current() == JavaVersion.VERSION_11) {
javaContainerSuffix = 'java11'
} else {
throw new GradleException("unsupported java version.")
}

// ValidatesRunner tests for the Python Portable runner (aka. ULR). Runs tests
// in the integration directory with the ULR to validate that the runner behaves
// as expected.
Expand All @@ -128,7 +137,7 @@ task sparkValidatesRunner {
task ulrValidatesRunner {
dependsOn ":sdks:go:test:goBuild"
dependsOn ":sdks:go:container:docker"
dependsOn ":sdks:java:container:java11:docker"
dependsOn ":sdks:java:container:" + javaContainerSuffix + ":docker"
dependsOn "setupVirtualenv"
dependsOn ":sdks:python:buildPython"
dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
Expand All @@ -150,4 +159,4 @@ task ulrValidatesRunner {
args "-c", ". ${envdir}/bin/activate && ./run_validatesrunner_tests.sh ${options.join(' ')}"
}
}
}
}

0 comments on commit 31b351b

Please sign in to comment.