Skip to content

Commit f8a9dec

Browse files
authored
Various improvements to integration tests (#6)
* Fixes to add new v2 phase Minor changes to old pom - creating a directory that needs to exist * revert changes to pom * The chmod can now be removed
1 parent 55bf2ca commit f8a9dec

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
.idea/
2+
integration-test/target/
13
*.class
24
*.log
5+
*.iml

integration-test/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,22 +155,6 @@
155155
</arguments>
156156
</configuration>
157157
</execution>
158-
<execution>
159-
<!-- TODO: Remove this hack once upstream is fixed by SPARK-22777 -->
160-
<id>set-exec-bit-on-docker-entrypoint-sh</id>
161-
<phase>pre-integration-test</phase>
162-
<goals>
163-
<goal>exec</goal>
164-
</goals>
165-
<configuration>
166-
<workingDirectory>${project.build.directory}/spark-distro/dockerfiles</workingDirectory>
167-
<executable>/bin/chmod</executable>
168-
<arguments>
169-
<argument>+x</argument>
170-
<argument>spark-base/entrypoint.sh</argument>
171-
</arguments>
172-
</configuration>
173-
</execution>
174158
</executions>
175159
</plugin>
176160
<plugin>

integration-test/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,10 @@ private[spark] class KubernetesSuite extends FunSuite with BeforeAndAfterAll wit
5858
}
5959

6060
test("Run SparkPi with no resources") {
61-
assume(testBackend.name == MINIKUBE_TEST_BACKEND)
62-
6361
runSparkPiAndVerifyCompletion()
6462
}
6563

6664
test("Run SparkPi with a very long application name.") {
67-
assume(testBackend.name == MINIKUBE_TEST_BACKEND)
68-
6965
sparkAppConf.set("spark.app.name", "long" * 40)
7066
runSparkPiAndVerifyCompletion()
7167
}

0 commit comments

Comments
 (0)