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 48498c6593c HDDS-15883. Split compat-old acceptance suite by version
(#11419)
48498c6593c is described below
commit 48498c6593cb0f5798e4e7832368587335d7bf5d
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Oct 9 12:43:18 2026 +0200
HDDS-15883. Split compat-old acceptance suite by version (#11419)
---
.github/workflows/ci.yml | 35 ++++++++++++++++++++--
dev-support/ci/acceptance_suites.sh | 4 +++
hadoop-ozone/dev-support/checks/acceptance.sh | 5 ++++
.../dist/src/main/compose/xcompat/test-old.sh | 5 ++++
4 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02bbff46721..aad4c794641 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,17 +56,18 @@ jobs:
GITHUB_CONTEXT: ${{ toJson(github) }}
outputs:
acceptance-suites: ${{ steps.acceptance-suites.outputs.suites }}
- test-classes: ${{ steps.selective-checks.outputs.test-classes }}
+ acceptance-versions: ${{ steps.acceptance-suites.outputs.versions }}
+ basic-checks: ${{ steps.categorize-basic-checks.outputs.basic-checks }}
integration-suites: ${{ steps.integration-suites.outputs.suites }}
kubernetes-suites: ${{ steps.kubernetes-suites.outputs.suites }}
needs-basic-check: ${{
steps.categorize-basic-checks.outputs.needs-basic-check }}
- basic-checks: ${{ steps.categorize-basic-checks.outputs.basic-checks }}
needs-build: ${{ steps.selective-checks.outputs.needs-build }}
needs-compile: ${{ steps.selective-checks.outputs.needs-compile }}
needs-compose-tests: ${{
steps.selective-checks.outputs.needs-compose-tests }}
needs-integration-tests: ${{
steps.selective-checks.outputs.needs-integration-tests }}
needs-kubernetes-tests: ${{
steps.selective-checks.outputs.needs-kubernetes-tests }}
sha: ${{ steps.get-sha.outputs.sha }}
+ test-classes: ${{ steps.selective-checks.outputs.test-classes }}
# `env` context cannot be used when calling reusable workflow, so we
need to convert these to `outputs`
build-args: ${{ env.BUILD_ARGS }}
java-version: ${{ env.TEST_JAVA_VERSION }}
@@ -328,6 +329,35 @@ jobs:
strategy:
matrix:
suite: ${{ fromJson(needs.build-info.outputs.acceptance-suites) }}
+ exclude:
+ - suite: compat-old
+ fail-fast: false
+
+ # acceptance (compat-old), split by old Ozone version
+ compat-old:
+ name: acceptance (compat-old)
+ needs:
+ - build-info
+ - build
+ - basic
+ - dependency
+ - license
+ if: needs.build-info.outputs.needs-compose-tests == 'true'
+ uses: $/.github/workflows/check.yml
+ secrets:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+ with:
+ needs-ozone-binary-tarball: true
+ ratis-args: ${{ inputs.ratis_args }}
+ script: acceptance
+ script-args: compat-old ${{ matrix.version }}
+ sha: ${{ needs.build-info.outputs.sha }}
+ split: compat-old-${{ matrix.version }}
+ timeout-minutes: 30
+ with-coverage: ${{ fromJSON(needs.build-info.outputs.with-coverage) }}
+ strategy:
+ matrix:
+ version: ${{ fromJson(needs.build-info.outputs.acceptance-versions) }}
fail-fast: false
kubernetes:
@@ -414,6 +444,7 @@ jobs:
needs:
- build-info
- acceptance
+ - compat-old
- integration
steps:
- name: Checkout project
diff --git a/dev-support/ci/acceptance_suites.sh
b/dev-support/ci/acceptance_suites.sh
index 4b37162ee74..3fd9788aa41 100755
--- a/dev-support/ci/acceptance_suites.sh
+++ b/dev-support/ci/acceptance_suites.sh
@@ -21,6 +21,10 @@
SUITES=$(grep --no-filename -r '^#suite:' hadoop-ozone/dist/src/main/compose \
| sort -u | cut -f2 -d':' | grep -v 'failing')
+VERSIONS=$(grep '^old_versions='
hadoop-ozone/dist/src/main/compose/xcompat/lib.sh \
+ | cut -f2 -d'"')
initialization::ga_output suites \
"$(initialization::parameters_to_json ${SUITES})"
+initialization::ga_output versions \
+ "$(initialization::parameters_to_json ${VERSIONS})"
diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh
b/hadoop-ozone/dev-support/checks/acceptance.sh
index dc56906cfdf..ae8415a8110 100755
--- a/hadoop-ozone/dev-support/checks/acceptance.sh
+++ b/hadoop-ozone/dev-support/checks/acceptance.sh
@@ -27,6 +27,11 @@ OZONE_ROOT=$(pwd -P)
: ${OZONE_ACCEPTANCE_TEST_TYPE:="robot"}
: ${OZONE_WITH_COVERAGE:="false"}
+if [[ "${OZONE_ACCEPTANCE_SUITE}" == "compat-old" ]]; then
+ : ${OZONE_OLD_VERSIONS:="${2:-}"}
+ export OZONE_OLD_VERSIONS
+fi
+
source "${DIR}/_lib.sh"
REPORT_DIR=${OUTPUT_DIR:-"${OZONE_ROOT}/target/acceptance"}
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
index b0f3ae35426..5a5cf39f4c8 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
@@ -25,6 +25,11 @@ export COMPOSE_DIR
# shellcheck source=hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
source "${COMPOSE_DIR}/lib.sh"
+# test specific version(s)
+if [[ -n "${OZONE_OLD_VERSIONS:-}" ]]; then
+ old_versions="${OZONE_OLD_VERSIONS}"
+fi
+
# old cluster with clients: same version and current version
for cluster_version in ${old_versions}; do
export OZONE_VERSION=${cluster_version}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
