Skip to content

Commit ba151c0

Browse files
lins05foxish
authored andcommitted
Build with sbt and fix scalastyle checks. (apache-spark-on-k8s#241)
1 parent 0e1cb40 commit ba151c0

File tree

8 files changed

+19
-7
lines changed

8 files changed

+19
-7
lines changed

project/SparkBuild.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ object BuildCommons {
5757
).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects
5858

5959
val optionallyEnabledProjects@Seq(mesos, yarn, java8Tests, sparkGangliaLgpl,
60-
streamingKinesisAsl, dockerIntegrationTests) =
61-
Seq("mesos", "yarn", "java8-tests", "ganglia-lgpl", "streaming-kinesis-asl",
62-
"docker-integration-tests").map(ProjectRef(buildLocation, _))
60+
streamingKinesisAsl, dockerIntegrationTests, kubernetes, _*) =
61+
Seq("mesos", "yarn", "java8-tests", "ganglia-lgpl", "streaming-kinesis-asl", "docker-integration-tests",
62+
"kubernetes", "kubernetes-integration-tests", "kubernetes-integration-tests-spark-jobs",
63+
"kubernetes-integration-tests-spark-jobs-helpers", "kubernetes-docker-minimal-bundle"
64+
).map(ProjectRef(buildLocation, _))
6365

6466
val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKafka010Assembly, streamingKinesisAslAssembly) =
6567
Seq("network-yarn", "streaming-flume-assembly", "streaming-kafka-0-8-assembly", "streaming-kafka-0-10-assembly", "streaming-kinesis-asl-assembly")

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/SSLUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package org.apache.spark.deploy.kubernetes
1919
import java.io.{File, FileOutputStream, OutputStreamWriter}
2020
import java.math.BigInteger
2121
import java.nio.file.Files
22-
import java.security.cert.X509Certificate
2322
import java.security.{KeyPair, KeyPairGenerator, KeyStore, SecureRandom}
23+
import java.security.cert.X509Certificate
2424
import java.util.{Calendar, Random}
2525
import javax.security.auth.x500.X500Principal
2626

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/submit/v2/ClientV2Suite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, Container,
2222
import io.fabric8.kubernetes.client.KubernetesClient
2323
import io.fabric8.kubernetes.client.dsl.{MixedOperation, NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable, PodResource}
2424
import org.hamcrest.{BaseMatcher, Description}
25-
import org.mockito.Matchers.{any, anyVararg, argThat, startsWith, eq => mockitoEq}
25+
import org.mockito.Matchers.{any, anyVararg, argThat, eq => mockitoEq, startsWith}
2626
import org.mockito.Mockito.when
2727
import org.mockito.invocation.InvocationOnMock
2828
import org.mockito.stubbing.Answer

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/rest/kubernetes/v2/ResourceStagingServerSslOptionsProviderSuite.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ class ResourceStagingServerSslOptionsProviderSuite extends SparkFunSuite with Be
9696
.set("spark.ssl.kubernetes.resourceStagingServer.keyStore", keyStoreFile.getAbsolutePath)
9797
.set("spark.ssl.kubernetes.resourceStagingServer.keyStorePasswordFile",
9898
keyStorePasswordFile.getAbsolutePath)
99-
.set("spark.ssl.kubernetes.resourceStagingServer.keyPasswordFile", keyPasswordFile.getAbsolutePath)
99+
.set("spark.ssl.kubernetes.resourceStagingServer.keyPasswordFile",
100+
keyPasswordFile.getAbsolutePath)
100101
val sslOptions = sslOptionsProvider.getSslOptions
101102
assert(sslOptions.keyStorePassword === Some("keyStorePassword"),
102103
"Incorrect keyStore password or it was not set.")

resource-managers/kubernetes/docker-minimal-bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<packaging>pom</packaging>
3232

3333
<properties>
34-
<sbt.project.name>docker-minimal-bundle</sbt.project.name>
34+
<sbt.project.name>kubernetes-docker-minimal-bundle</sbt.project.name>
3535
<build.testJarPhase>none</build.testJarPhase>
3636
<build.copyDependenciesPhase>pre-integration-test</build.copyDependenciesPhase>
3737
</properties>

resource-managers/kubernetes/integration-tests-spark-jobs-helpers/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<artifactId>spark-kubernetes-integration-tests-spark-jobs-helpers_2.11</artifactId>
2828
<packaging>jar</packaging>
2929
<name>Spark Project Kubernetes Integration Tests Spark Jobs Helpers</name>
30+
<properties>
31+
<sbt.project.name>kubernetes-integration-tests-spark-jobs-helpers</sbt.project.name>
32+
</properties>
3033

3134
<dependencies>
3235
</dependencies>

resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<artifactId>spark-kubernetes-integration-tests-spark-jobs_2.11</artifactId>
2828
<packaging>jar</packaging>
2929
<name>Spark Project Kubernetes Integration Tests Spark Jobs</name>
30+
<properties>
31+
<sbt.project.name>kubernetes-integration-tests-spark-jobs</sbt.project.name>
32+
</properties>
3033

3134
<dependencies>
3235
<dependency>

resource-managers/kubernetes/integration-tests/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
</parent>
2626

2727
<artifactId>spark-kubernetes-integration-tests_2.11</artifactId>
28+
<properties>
29+
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>
30+
</properties>
2831
<packaging>jar</packaging>
2932
<name>Spark Project Kubernetes Integration Tests</name>
3033

0 commit comments

Comments
 (0)