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.

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

HDDS-11729. Update skipRecon profile to skip only frontend build #7454

Merged
merged 3 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/intermittent-test-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/checkstyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/findbugs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/junit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/license.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/sonar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 4 additions & 15 deletions hadoop-ozone/dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down
14 changes: 2 additions & 12 deletions hadoop-ozone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down