Skip to content

[SPARK-49518][K8S][BUILD] Change to using build-helper-maven-plugin to manage the code for volcano #47997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 2 commits into from
Closed

[SPARK-49518][K8S][BUILD] Change to using build-helper-maven-plugin to manage the code for volcano #47997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93ecae
init
LuciferYang Sep 5, 2024
f4550dc
Merge branch 'upmaster' into refactor-volcano
LuciferYang Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,6 @@ object SparkBuild extends PomBuild {

enable(DockerIntegrationTests.settings)(dockerIntegrationTests)

if (!profiles.contains("volcano")) {
enable(Volcano.settings)(kubernetes)
enable(Volcano.settings)(kubernetesIntegrationTests)
}

enable(KubernetesIntegrationTests.settings)(kubernetesIntegrationTests)

enable(YARN.settings)(yarn)
Expand Down Expand Up @@ -1322,13 +1317,6 @@ object SparkR {
)
}

object Volcano {
// Exclude all volcano file for Compile and Test
lazy val settings = Seq(
unmanagedSources / excludeFilter := HiddenFileFilter || "*Volcano*.scala"
)
}

trait SharedUnidocSettings {

import BuildCommons._
Expand Down
51 changes: 34 additions & 17 deletions resource-managers/kubernetes/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,11 @@
<name>Spark Project Kubernetes</name>
<properties>
<sbt.project.name>kubernetes</sbt.project.name>
<volcano.exclude>**/*Volcano*.scala</volcano.exclude>
</properties>

<profiles>
<profile>
<id>volcano</id>
<properties>
<volcano.exclude></volcano.exclude>
</properties>
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
Expand All @@ -50,6 +46,40 @@
<version>${kubernetes-client.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-volcano-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>volcano/src/main/scala</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-volcano-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>volcano/src/test/scala</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand Down Expand Up @@ -151,19 +181,6 @@


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>${volcano.exclude}</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
</build>
Expand Down
0 ...loy/k8s/features/VolcanoFeatureStep.scala → ...loy/k8s/features/VolcanoFeatureStep.scala
View file
Open in desktop
File renamed without changes.
0 ...8s/features/VolcanoFeatureStepSuite.scala → ...8s/features/VolcanoFeatureStepSuite.scala
View file
Open in desktop
File renamed without changes.
39 changes: 22 additions & 17 deletions resource-managers/kubernetes/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<test.exclude.tags></test.exclude.tags>
<test.default.exclude.tags>org.apache.spark.deploy.k8s.integrationtest.YuniKornTag</test.default.exclude.tags>
<test.include.tags></test.include.tags>
<volcano.exclude>**/*Volcano*.scala</volcano.exclude>
</properties>
<packaging>jar</packaging>
<name>Spark Project Kubernetes Integration Tests</name>
Expand Down Expand Up @@ -83,19 +82,6 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>${volcano.exclude}</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -219,16 +205,35 @@
</profile>
<profile>
<id>volcano</id>
<properties>
<volcano.exclude></volcano.exclude>
</properties>
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>volcano-client</artifactId>
<version>${kubernetes-client.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-volcano-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>volcano/src/test/scala</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
0 ...oy/k8s/integrationtest/VolcanoSuite.scala → ...oy/k8s/integrationtest/VolcanoSuite.scala
View file
Open in desktop
File renamed without changes.
0 ...s/integrationtest/VolcanoTestsSuite.scala → ...s/integrationtest/VolcanoTestsSuite.scala
View file
Open in desktop
File renamed without changes.