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 1a73b7558d6 HDDS-16940. Make test goals cacheable and enable
Develocity remote build cache (#11489)
1a73b7558d6 is described below
commit 1a73b7558d6ee7cfc9297317163f9f0c93c91fee
Author: Jérôme Prinet <[email protected]>
AuthorDate: Tue Oct 13 22:48:41 2026 +0200
HDDS-16940. Make test goals cacheable and enable Develocity remote build
cache (#11489)
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Doroszlai, Attila
<[email protected]>
---
.github/workflows/ci-with-ratis.yml | 2 +-
.github/workflows/intermittent-test-check.yml | 2 +-
.github/workflows/post-commit.yml | 2 +-
.github/workflows/repeat-acceptance.yml | 2 +-
.mvn/develocity.xml | 3 +-
hadoop-ozone/dev-support/checks/repro.sh | 4 +-
pom.xml | 64 +++++++++++++++++++++++++++
7 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci-with-ratis.yml
b/.github/workflows/ci-with-ratis.yml
index 6df0b4f4b75..2d628c1f036 100644
--- a/.github/workflows/ci-with-ratis.yml
+++ b/.github/workflows/ci-with-ratis.yml
@@ -51,7 +51,7 @@ jobs:
permissions:
contents: read
secrets:
- DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.OZONE_DEVELOCITY_ACCESS_KEY }}
SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
with:
ratis_args: ${{ needs.ratis.outputs.build-args }}
diff --git a/.github/workflows/intermittent-test-check.yml
b/.github/workflows/intermittent-test-check.yml
index 31b825558c2..a2fc663dacb 100644
--- a/.github/workflows/intermittent-test-check.yml
+++ b/.github/workflows/intermittent-test-check.yml
@@ -213,7 +213,7 @@ jobs:
hadoop-ozone/dev-support/checks/junit.sh $args
-Dtest="$TEST_CLASS#$TEST_METHOD,Abstract*Test*\$*"
fi
env:
- DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.OZONE_DEVELOCITY_ACCESS_KEY }}
repo_path: ${{ steps.download-ozone-repo.outputs.download-path }}
ratis_args: ${{ needs.ratis.outputs.build-args }}
- name: Summary of failures
diff --git a/.github/workflows/post-commit.yml
b/.github/workflows/post-commit.yml
index 4c752764c68..31af4363bef 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -29,6 +29,6 @@ jobs:
|| (github.repository != 'apache/ozone' && github.ref_name != 'master')
uses: $/.github/workflows/ci.yml
secrets:
- DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.OZONE_DEVELOCITY_ACCESS_KEY }}
OZONE_WEBSITE_BUILD: ${{ secrets.OZONE_WEBSITE_BUILD }}
SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
diff --git a/.github/workflows/repeat-acceptance.yml
b/.github/workflows/repeat-acceptance.yml
index 476e54ee0de..b88401cd88f 100644
--- a/.github/workflows/repeat-acceptance.yml
+++ b/.github/workflows/repeat-acceptance.yml
@@ -114,7 +114,7 @@ jobs:
- name: Run a full build
run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc
-Dmaven.javadoc.skip=true
env:
- DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.OZONE_DEVELOCITY_ACCESS_KEY }}
- name: Store binaries for tests
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
# v7.0.1
with:
diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
index 5aa72e6acbb..c3d27cfc67e 100644
--- a/.mvn/develocity.xml
+++ b/.mvn/develocity.xml
@@ -46,7 +46,8 @@
<enabled>#{isFalse(env['GITHUB_ACTIONS'])}</enabled>
</local>
<remote>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <storeEnabled>#{isTrue(env['GITHUB_ACTIONS']) and
env['DEVELOCITY_ACCESS_KEY'] != null and env['DEVELOCITY_ACCESS_KEY'] !=
''}</storeEnabled>
</remote>
</buildCache>
</develocity>
diff --git a/hadoop-ozone/dev-support/checks/repro.sh
b/hadoop-ozone/dev-support/checks/repro.sh
index cbc707c1274..dd917e6d0cb 100755
--- a/hadoop-ozone/dev-support/checks/repro.sh
+++ b/hadoop-ozone/dev-support/checks/repro.sh
@@ -23,4 +23,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1
&& pwd )"
CHECK=repro
ERROR_PATTERN='ERROR.*mismatch'
-source "${DIR}"/_build.sh verify artifact:compare "$@"
+source "${DIR}"/_build.sh verify artifact:compare "$@" \
+ -Ddevelocity.cache.local.enabled=false \
+ -Ddevelocity.cache.remote.enabled=false
diff --git a/pom.xml b/pom.xml
index a8695eeb3fb..260e9ed5efb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1755,6 +1755,70 @@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <!-- Declare paths passed to tests via system properties as
inputs/local state, so that test goals get a cache key -->
+ <!-- (required by Develocity Predictive Test Selection) -->
+ <groupId>com.gradle</groupId>
+ <artifactId>develocity-maven-extension</artifactId>
+ <version>2.6.0</version>
+ <configuration>
+ <develocity>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inputs>
+ <fileSets>
+ <fileSet>
+ <name>krb5-conf</name>
+ <paths>
+
<path>${project.build.directory}/test-classes/krb5.conf</path>
+ </paths>
+ <normalization>RELATIVE_PATH</normalization>
+ </fileSet>
+ <fileSet>
+ <name>native-lib</name>
+ <paths>
+
<path>${maven.multiModuleProjectDirectory}/target/native-lib</path>
+ </paths>
+ <normalization>RELATIVE_PATH</normalization>
+ </fileSet>
+ <fileSet>
+ <name>rocksdb-native-lib</name>
+ <paths>
+
<path>${project.build.directory}/native/rocksdb</path>
+
<path>${maven.multiModuleProjectDirectory}/hadoop-hdds/rocks-native/target/native/rocksdb</path>
+ </paths>
+ <normalization>RELATIVE_PATH</normalization>
+ </fileSet>
+ </fileSets>
+ </inputs>
+ <localState>
+ <fileSets>
+ <fileSet>
+ <name>test-dir</name>
+ <paths>
+ <path>${test.build.dir}</path>
+ </paths>
+ </fileSet>
+ <fileSet>
+ <name>log-dir</name>
+ <paths>
+ <path>${project.build.directory}/log</path>
+ </paths>
+ </fileSet>
+ <fileSet>
+ <name>tmp-dir</name>
+ <paths>
+ <path>${project.build.directory}/tmp</path>
+ </paths>
+ </fileSet>
+ </fileSets>
+ </localState>
+ </plugin>
+ </plugins>
+ </develocity>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
