Skip to content
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

Jump to bottom

Enable default splunk and confluent dependencies #1785

Merged
merged 2 commits into from
Aug 13, 2024
Merged

Enable default splunk and confluent dependencies #1785

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
a64684e
Enable default splunk and confluent dependencies
Polber Aug 12, 2024
26cba9d
fix site-report plugin
Polber Aug 13, 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
2 changes: 1 addition & 1 deletion .github/actions/publish-site-report/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
steps:
- name: Generate Site Report
shell: bash
run: mvn -B surefire-report:report-only -f pom.xml -Daggregate=true
run: mvn -B surefire-report:report-only -f pom.xml -Daggregate=true -Denforcer.skip=true
- name: Publish Site Report
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v3.1.2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
if: always()
- name: Create artifacts and push
run: |
mvn verify -PtemplatesRelease,splunkDeps,missing-artifact-repos \
mvn verify -PtemplatesRelease \
-DprojectId="dataflow-templates" \
-DbucketName="dataflow-templates-staging" \
-DlibrariesBucketName="dataflow-templates-libraries" \
Expand Down
6 changes: 3 additions & 3 deletions cicd/internal/workflows/maven-workflows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ func (*mvnFlags) FailAtTheEnd() string {
}

func (*mvnFlags) RunIntegrationTests() string {
return "-PtemplatesIntegrationTests,splunkDeps,missing-artifact-repos"
return "-PtemplatesIntegrationTests"
}

func (*mvnFlags) RunIntegrationSmokeTests() string {
return "-PtemplatesIntegrationSmokeTests,splunkDeps,missing-artifact-repos"
return "-PtemplatesIntegrationSmokeTests"
}

func (*mvnFlags) RunLoadTests() string {
return "-PtemplatesLoadTests,splunkDeps,missing-artifact-repos"
return "-PtemplatesLoadTests"
}

// The number of modules Maven is going to build in parallel in a multi-module project.
Expand Down
2 changes: 1 addition & 1 deletion it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ private String[] buildMavenStageCommand(
"-pl",
moduleBuild,
"-am",
"-PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos",
"-PtemplatesStage,pluginOutputDir",
"-DpluginRunId=" + RandomStringUtils.randomAlphanumeric(16),
// Skip shading for now due to flakiness / slowness in the process.
"-DskipShade=" + skipShade,
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ String[] buildMavenStageCommand(
"-pl",
moduleBuild,
"-am",
"-PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos",
"-PtemplatesStage,pluginOutputDir",
// Skip shading for now due to flakiness / slowness in the process.
"-DskipShade=" + true,
"-DskipTests",
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void testBuildMavenStageCommand() {
assertThat(String.join(" ", Arrays.copyOfRange(actual, 0, 5)))
.isEqualTo("mvn compile package -q -f");
String expected =
"-pl metadata,v2/common,v2/spanner-change-streams-to-sharded-file-sink -am -PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos -DskipShade=true -DskipTests -Dmaven.test.skip -Dcheckstyle.skip -Dmdep.analyze.skip -Dspotless.check.skip -Denforcer.skip -DprojectId=testProject -Dregion=us-central1 -DbucketName=TestBucketName -DgcpTempLocation=TestBucketName -DstagePrefix=TestClassName -DtemplateName=Spanner_Change_Streams_to_Sharded_File_Sink -DunifiedWorker=true -e";
"-pl metadata,v2/common,v2/spanner-change-streams-to-sharded-file-sink -am -PtemplatesStage,pluginOutputDir -DskipShade=true -DskipTests -Dmaven.test.skip -Dcheckstyle.skip -Dmdep.analyze.skip -Dspotless.check.skip -Denforcer.skip -DprojectId=testProject -Dregion=us-central1 -DbucketName=TestBucketName -DgcpTempLocation=TestBucketName -DstagePrefix=TestClassName -DtemplateName=Spanner_Change_Streams_to_Sharded_File_Sink -DunifiedWorker=true -e";
assertThat(String.join(" ", Arrays.copyOfRange(actual, 6, 25))).isEqualTo(expected);
assertThat(actual[5]).endsWith("pom.xml");
assertThat(actual[25]).isNotEmpty();
Expand Down
51 changes: 50 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,19 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.6</version>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>com.google.cloud.artifactregistry</groupId>
<artifactId>artifactregistry-maven-wagon</artifactId>
<version>2.2.0</version>
</extension>
</extensions>
</build>

<profiles>
Expand Down Expand Up @@ -600,10 +612,32 @@
</repository>
</repositories>
</profile>
<profile>
<id>internalMaven</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
<id>central</id>
<name>Maven Central remote repository</name>
<url>artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>splunkDeps</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!skipSplunkDeps</name>
</property>
</activation>
<repositories>
<repository>
Expand All @@ -623,6 +657,21 @@
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>confluentDeps</id>
<activation>
<property>
<name>!skipConfluentDeps</name>
</property>
</activation>
<repositories>
<repository>
<!-- Required for io.confluent:kafka-avro-serializer artifact -->
<id>confluent</id>
<url>https://packages.confluent.io/maven/</url>
</repository>
</repositories>
</profile>
<profile>
<!-- mvn clean deploy -Prelease -pl plugins/templates-maven-plugin -pl v2/common -am -->
<id>release</id>
Expand Down
13 changes: 0 additions & 13 deletions v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,19 +948,6 @@
</build>

<profiles>
<profile>
<id>missing-artifact-repos</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<!-- Required for io.confluent:kafka-avro-serializer artifact -->
<id>confluent</id>
<url>https://packages.confluent.io/maven/</url>
</repository>
</repositories>
</profile>
<profile>
<id>shade</id>
<activation>
Expand Down
13 changes: 0 additions & 13 deletions v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,19 +467,6 @@
</build>

<profiles>
<profile>
<id>missing-artifact-repos</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<!-- Required for io.confluent:kafka-avro-serializer artifact -->
<id>confluent</id>
<url>https://packages.confluent.io/maven/</url>
</repository>
</repositories>
</profile>
<profile>
<id>shade</id>
<activation>
Expand Down
Loading