Skip to content

Commit af2ec97

Browse files
Stavros Kontopoulossrowen
authored andcommitted
[SPARK-25930][K8S] Fix scala string detection in k8s tests
## What changes were proposed in this pull request? - Issue is described in detail in [SPARK-25930](https://issues.apache.org/jira/browse/SPARK-25930). Since we rely on the std output, pick always the last line which contains the wanted value. Although minor, current implementation breaks tests. ## How was this patch tested? manually. rm -rf ~/.m2 and then run the tests. Closes apache#22931 from skonto/fix_scala_detection. Authored-by: Stavros Kontopoulos <[email protected]> Signed-off-by: Sean Owen <[email protected]> (cherry picked from commit 1fb3759) Signed-off-by: Sean Owen <[email protected]>
1 parent 5bc4e7d commit af2ec97

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ NAMESPACE=
2828
SERVICE_ACCOUNT=
2929
INCLUDE_TAGS="k8s"
3030
EXCLUDE_TAGS=
31-
SCALA_VERSION="$($TEST_ROOT_DIR/build/mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=scala.binary.version | grep -v '\[' )"
31+
MVN="$TEST_ROOT_DIR/build/mvn"
32+
33+
SCALA_VERSION=$("$MVN" help:evaluate -Dexpression=scala.binary.version 2>/dev/null\
34+
| grep -v "INFO"\
35+
| grep -v "WARNING"\
36+
| tail -n 1)
3237

3338
# Parse arguments
3439
while (( "$#" )); do

0 commit comments

Comments
 (0)