Repository: spark Updated Branches: refs/heads/master 6fd5ff395 -> 7d44bc264
[SPARK-25835][K8S] Create kubernetes-tests profile and use the detected SCALA_VERSION ## What changes were proposed in this pull request? - Fixes the scala version propagation issue. - Disables the tests under the k8s profile, now we will run them manually. Adds a test specific profile otherwise tests will not run if we just remove the module from the kubernetes profile (quickest solution I can think of). ## How was this patch tested? Manually by running the tests with different versions of scala. Closes #22838 from skonto/propagate-scala2.12. Authored-by: Stavros Kontopoulos <stavros.kontopou...@lightbend.com> Signed-off-by: Sean Owen <sean.o...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7d44bc26 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7d44bc26 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7d44bc26 Branch: refs/heads/master Commit: 7d44bc26408b2189804fd305797afcefb7b2b0e0 Parents: 6fd5ff3 Author: Stavros Kontopoulos <stavros.kontopou...@lightbend.com> Authored: Fri Oct 26 08:49:27 2018 -0500 Committer: Sean Owen <sean.o...@databricks.com> Committed: Fri Oct 26 08:49:27 2018 -0500 ---------------------------------------------------------------------- pom.xml | 7 +++++++ .../integration-tests/dev/dev-run-integration-tests.sh | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7d44bc26/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 92934c1..597fb2f 100644 --- a/pom.xml +++ b/pom.xml @@ -2656,6 +2656,13 @@ <id>kubernetes</id> <modules> <module>resource-managers/kubernetes/core</module> + </modules> + </profile> + + <!-- generally not enabled for automated builds, but will run k8s tests --> + <profile> + <id>kubernetes-integration-tests</id> + <modules> <module>resource-managers/kubernetes/integration-tests</module> </modules> </profile> http://git-wip-us.apache.org/repos/asf/spark/blob/7d44bc26/resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh b/resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh index e26c0b3..c3c843e 100755 --- a/resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh +++ b/resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh @@ -28,6 +28,7 @@ NAMESPACE= SERVICE_ACCOUNT= INCLUDE_TAGS="k8s" EXCLUDE_TAGS= +SCALA_VERSION="$($TEST_ROOT_DIR/build/mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=scala.binary.version | grep -v '\[' )" # Parse arguments while (( "$#" )); do @@ -103,4 +104,4 @@ then properties=( ${properties[@]} -Dtest.exclude.tags=$EXCLUDE_TAGS ) fi -$TEST_ROOT_DIR/build/mvn integration-test -f $TEST_ROOT_DIR/pom.xml -pl resource-managers/kubernetes/integration-tests -am -Pkubernetes ${properties[@]} +$TEST_ROOT_DIR/build/mvn integration-test -f $TEST_ROOT_DIR/pom.xml -pl resource-managers/kubernetes/integration-tests -am -Pscala-$SCALA_VERSION -Pkubernetes -Pkubernetes-integration-tests ${properties[@]} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
