[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.kontopoulos@lightbend.com> Signed-off-by: Sean Owen <sean.owen@databricks.com>
This commit is contained in:
parent
6fd5ff3951
commit
7d44bc2640
7
pom.xml
7
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>
|
||||
|
|
|
@ -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[@]}
|
||||
|
|
Loading…
Reference in a new issue