Repository: spark Updated Branches: refs/heads/master e58dadb77 -> 7bd6d5412
[SPARK-24711][K8S] Fix tags for integration tests ## What changes were proposed in this pull request? - disables maven surfire plugin to allow tags function properly, doc here: http://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin ## How was this patch tested? Manually by adding tags. Author: Stavros Kontopoulos <stavros.kontopou...@lightbend.com> Closes #21697 from skonto/fix-tags. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7bd6d541 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7bd6d541 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7bd6d541 Branch: refs/heads/master Commit: 7bd6d5412072643f2320fd389f323cfc51368c81 Parents: e58dadb Author: Stavros Kontopoulos <stavros.kontopou...@lightbend.com> Authored: Thu Jul 5 08:38:26 2018 -0500 Committer: Sean Owen <sro...@gmail.com> Committed: Thu Jul 5 08:38:26 2018 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- .../dev/dev-run-integration-tests.sh | 20 ++++++++++++++++++++ .../kubernetes/integration-tests/pom.xml | 11 +++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7bd6d541/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ca30f9f..cd567e2 100644 --- a/pom.xml +++ b/pom.xml @@ -2122,7 +2122,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20.1</version> + <version>2.22.0</version> <!-- Note config is repeated in scalatest config --> <configuration> <includes> http://git-wip-us.apache.org/repos/asf/spark/blob/7bd6d541/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 ea893fa..3acd0f5 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 @@ -27,6 +27,8 @@ IMAGE_TAG="N/A" SPARK_MASTER= NAMESPACE= SERVICE_ACCOUNT= +INCLUDE_TAGS= +EXCLUDE_TAGS= # Parse arguments while (( "$#" )); do @@ -59,6 +61,14 @@ while (( "$#" )); do SERVICE_ACCOUNT="$2" shift ;; + --include-tags) + INCLUDE_TAGS="$2" + shift + ;; + --exclude-tags) + EXCLUDE_TAGS="$2" + shift + ;; *) break ;; @@ -90,4 +100,14 @@ then properties=( ${properties[@]} -Dspark.kubernetes.test.master=$SPARK_MASTER ) fi +if [ -n $EXCLUDE_TAGS ]; +then + properties=( ${properties[@]} -Dtest.exclude.tags=$EXCLUDE_TAGS ) +fi + +if [ -n $INCLUDE_TAGS ]; +then + properties=( ${properties[@]} -Dtest.include.tags=$INCLUDE_TAGS ) +fi + ../../../build/mvn integration-test ${properties[@]} http://git-wip-us.apache.org/repos/asf/spark/blob/7bd6d541/resource-managers/kubernetes/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 520bda8..6a2fff8 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -40,6 +40,7 @@ <spark.kubernetes.test.deployMode>minikube</spark.kubernetes.test.deployMode> <spark.kubernetes.test.imageRepo>docker.io/kubespark</spark.kubernetes.test.imageRepo> <test.exclude.tags></test.exclude.tags> + <test.include.tags></test.include.tags> </properties> <packaging>jar</packaging> <name>Spark Project Kubernetes Integration Tests</name> @@ -102,6 +103,15 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <plugin> <!-- Triggers scalatest plugin in the integration-test phase instead of the test phase. --> @@ -126,6 +136,7 @@ <spark.kubernetes.test.serviceAccountName>${spark.kubernetes.test.serviceAccountName}</spark.kubernetes.test.serviceAccountName> </systemProperties> <tagsToExclude>${test.exclude.tags}</tagsToExclude> + <tagsToInclude>${test.include.tags}</tagsToInclude> </configuration> <executions> <execution> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org