diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dff554c18e1..4c6723daff8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ env: FAIL_FAST: ${{ github.event_name == 'pull_request' }} # Minimum required Java version for running Ozone is defined in pom.xml (javac.version). TEST_JAVA_VERSION: 21 # JDK version used by CI build and tests; should match the JDK version in apache/ozone-runner image + MAVEN_ARGS: --batch-mode --settings ${{ github.workspace }}/dev-support/ci/maven-settings.xml --show-version MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 HADOOP_IMAGE: ghcr.io/apache/hadoop OZONE_IMAGE: ghcr.io/apache/ozone diff --git a/dev-support/ci/maven-settings.xml b/dev-support/ci/maven-settings.xml new file mode 100644 index 00000000000..43fa07bb52b --- /dev/null +++ b/dev-support/ci/maven-settings.xml @@ -0,0 +1,35 @@ + + + + + + block-snapshots1 + apache.snapshots + Block access to Apache Snapshots + https://repository.apache.org/snapshots + true + + + block-snapshots2 + apache.snapshots.https + Block access to Apache Snapshots + https://repository.apache.org/content/repositories/snapshots + true + + + diff --git a/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh b/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh index cfdab10c903..03600616a76 100644 --- a/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh +++ b/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh @@ -98,7 +98,7 @@ EOF # - ITestS3AContractDistCp: HDDS-10616 # - ITestS3AContractMkdirWithCreatePerf: HDDS-11662 # - ITestS3AContractRename: HDDS-10665 - mvn -B -V --fail-never --no-transfer-progress \ + mvn ${MAVEN_ARGS:-} --fail-never \ -Dtest='ITestS3AContract*, ITestS3ACommitterMRJob, !ITestS3AContractBulkDelete, !ITestS3AContractCreate#testOverwrite*EmptyDirectory[*], !ITestS3AContractDistCp, !ITestS3AContractMkdirWithCreatePerf, !ITestS3AContractRename' \ clean test