This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 433c7bb186 HDDS-11729. Update skipRecon property to skip only frontend
build (#7454)
433c7bb186 is described below
commit 433c7bb18626d915c711c1de6322b612589c60cd
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Nov 20 10:33:39 2024 +0100
HDDS-11729. Update skipRecon property to skip only frontend build (#7454)
---
.github/workflows/ci.yml | 2 +-
.github/workflows/intermittent-test-check.yml | 2 +-
hadoop-ozone/dev-support/checks/checkstyle.sh | 2 +-
hadoop-ozone/dev-support/checks/findbugs.sh | 2 +-
hadoop-ozone/dev-support/checks/junit.sh | 2 +-
hadoop-ozone/dev-support/checks/license.sh | 2 +-
hadoop-ozone/dev-support/checks/sonar.sh | 2 +-
hadoop-ozone/dist/pom.xml | 19 ++++---------------
hadoop-ozone/pom.xml | 14 ++------------
pom.xml | 16 +++++++++++++++-
10 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf180b1500..2947def227 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -222,7 +222,7 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Compile Ozone using Java ${{ matrix.java }}
- run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Dskip.npx
-Dskip.installnpx -Dmaven.javadoc.failOnWarnings=${{ matrix.java != 8 }}
-Djavac.version=${{ matrix.java }} ${{ inputs.ratis_args }}
+ run: hadoop-ozone/dev-support/checks/build.sh -Pdist -DskipRecon
-Dmaven.javadoc.failOnWarnings=${{ matrix.java != 8 }} -Djavac.version=${{
matrix.java }} ${{ inputs.ratis_args }}
env:
OZONE_WITH_COVERAGE: false
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/.github/workflows/intermittent-test-check.yml
b/.github/workflows/intermittent-test-check.yml
index 33a1ee2c6e..cb765f3621 100644
--- a/.github/workflows/intermittent-test-check.yml
+++ b/.github/workflows/intermittent-test-check.yml
@@ -115,7 +115,7 @@ jobs:
java-version: 8
- name: Build (most) of Ozone
run: |
- args="-Dskip.npx -Dskip.installnpx -DskipShade
-Dmaven.javadoc.skip=true"
+ args="-DskipRecon -DskipShade -Dmaven.javadoc.skip=true"
if [[ "${{ github.event.inputs.ratis-ref }}" != "" ]]; then
args="$args -Dratis.version=${{ needs.ratis.outputs.ratis-version
}}"
args="$args -Dratis.thirdparty.version=${{
needs.ratis.outputs.thirdparty-version }}"
diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh
b/hadoop-ozone/dev-support/checks/checkstyle.sh
index 18ae390597..edab230766 100755
--- a/hadoop-ozone/dev-support/checks/checkstyle.sh
+++ b/hadoop-ozone/dev-support/checks/checkstyle.sh
@@ -24,7 +24,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/checkstyle"}
mkdir -p "$REPORT_DIR"
REPORT_FILE="$REPORT_DIR/summary.txt"
-MAVEN_OPTIONS='-B -fae -Dskip.npx -Dskip.installnpx
-Dcheckstyle.failOnViolation=false --no-transfer-progress'
+MAVEN_OPTIONS='-B -fae -DskipRecon -Dcheckstyle.failOnViolation=false
--no-transfer-progress'
declare -i rc
mvn ${MAVEN_OPTIONS} checkstyle:check > "${REPORT_DIR}/output.log"
diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh
b/hadoop-ozone/dev-support/checks/findbugs.sh
index 8c61c524a9..95555c177f 100755
--- a/hadoop-ozone/dev-support/checks/findbugs.sh
+++ b/hadoop-ozone/dev-support/checks/findbugs.sh
@@ -25,7 +25,7 @@ source "${DIR}/_lib.sh"
install_spotbugs
-MAVEN_OPTIONS='-B -fae -Dskip.npx -Dskip.installnpx --no-transfer-progress'
+MAVEN_OPTIONS='-B -fae -DskipRecon --no-transfer-progress'
if [[ "${OZONE_WITH_COVERAGE}" != "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"
diff --git a/hadoop-ozone/dev-support/checks/junit.sh
b/hadoop-ozone/dev-support/checks/junit.sh
index f0002d4eed..fa3c219c96 100755
--- a/hadoop-ozone/dev-support/checks/junit.sh
+++ b/hadoop-ozone/dev-support/checks/junit.sh
@@ -31,7 +31,7 @@ if [[ ${ITERATIONS} -le 0 ]]; then
fi
export MAVEN_OPTS="-Xmx4096m ${MAVEN_OPTS:-}"
-MAVEN_OPTIONS="-B -V -Dskip.npx -Dskip.installnpx -Dnative.lib.tmp.dir=/tmp
--no-transfer-progress"
+MAVEN_OPTIONS="-B -V -DskipRecon -Dnative.lib.tmp.dir=/tmp
--no-transfer-progress"
if [[ "${OZONE_WITH_COVERAGE}" != "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"
diff --git a/hadoop-ozone/dev-support/checks/license.sh
b/hadoop-ozone/dev-support/checks/license.sh
index 90accc8566..304b84e539 100755
--- a/hadoop-ozone/dev-support/checks/license.sh
+++ b/hadoop-ozone/dev-support/checks/license.sh
@@ -42,7 +42,7 @@ DEFAULT_SRC="target/generated-sources/license/THIRD-PARTY.txt"
src="${1:-${DEFAULT_SRC}}"
if [[ ! -e ${src} ]]; then
- MAVEN_OPTIONS="-B -fae -Dskip.npx -Dskip.installnpx --no-transfer-progress
${MAVEN_OPTIONS:-}"
+ MAVEN_OPTIONS="-B -fae -DskipRecon --no-transfer-progress ${MAVEN_OPTIONS:-}"
mvn ${MAVEN_OPTIONS} license:aggregate-add-third-party | tee
"${REPORT_DIR}/output.log"
src="${DEFAULT_SRC}"
fi
diff --git a/hadoop-ozone/dev-support/checks/sonar.sh
b/hadoop-ozone/dev-support/checks/sonar.sh
index 27a971f691..b9948a31d4 100755
--- a/hadoop-ozone/dev-support/checks/sonar.sh
+++ b/hadoop-ozone/dev-support/checks/sonar.sh
@@ -24,7 +24,7 @@ if [ ! "$SONAR_TOKEN" ]; then
fi
-mvn -V -B -DskipShade -DskipTests -Dskip.npx -Dskip.installnpx
--no-transfer-progress \
+mvn -V -B -DskipShade -DskipTests -DskipRecon --no-transfer-progress \
-Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache
-Dsonar.projectKey=hadoop-ozone \
verify org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index e010ecdb60..1da959002a 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -166,6 +166,10 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-recon</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-s3gateway</artifactId>
@@ -234,21 +238,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>build-with-recon</id>
- <activation>
- <property>
- <name>!skipRecon</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-recon</artifactId>
- </dependency>
- </dependencies>
- </profile>
<profile>
<!-- turn on the profile to copy all the required jar files to measure
coverage -->
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index ed118c8947..a8b32c686a 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -38,6 +38,8 @@
<module>ozonefs-common</module>
<module>ozonefs</module>
<module>datanode</module>
+ <module>recon</module>
+ <module>recon-codegen</module>
<module>s3gateway</module>
<module>dist</module>
<module>csi</module>
@@ -396,18 +398,6 @@
<module>ozonefs-hadoop2</module>
</modules>
</profile>
- <profile>
- <id>build-with-recon</id>
- <activation>
- <property>
- <name>!skipRecon</name>
- </property>
- </activation>
- <modules>
- <module>recon</module>
- <module>recon-codegen</module>
- </modules>
- </profile>
<profile>
<id>parallel-tests</id>
<build>
diff --git a/pom.xml b/pom.xml
index 89a12e7083..56ab9252ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2107,12 +2107,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<properties>
<test>void</test>
<skip.npx>true</skip.npx>
- <skip.installnpx>true</skip.installnpx>
+ <skip.installnodenpm>true</skip.installnodenpm>
<skipDocs>true</skipDocs>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.shade.skip>true</maven.shade.skip>
</properties>
</profile>
+
+ <profile>
+ <id>skip-frontend</id>
+ <activation>
+ <property>
+ <name>skipRecon</name>
+ </property>
+ </activation>
+ <properties>
+ <skip.npx>true</skip.npx>
+ <skip.installnodenpm>true</skip.installnodenpm>
+ </properties>
+ </profile>
+
<profile>
<!-- @Native tests are excluded by default. This profile removes the
exclusion if native build is enabled. -->
<id>rocks-native-tests</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
