HDDS-11265. Add Ozone 1.4.1 to compatibility acceptance tests (#7503)

apache · Nov 29, 2024 · 2c6c116 · 2c6c116
1 parent ebcdc6a
commit 2c6c116
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -36,7 +36,8 @@ RESULT_DIR="$ALL_RESULT_DIR" create_results_dir
 # This is the version of Ozone that should use the runner image to run the
 # code that was built. Other versions will pull images from docker hub.
 export OZONE_CURRENT_VERSION="${ozone.version}"
-run_test ha non-rolling-upgrade 1.4.0 "$OZONE_CURRENT_VERSION"
+run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
+# run_test ha non-rolling-upgrade 1.4.0 "$OZONE_CURRENT_VERSION"
 # run_test ha non-rolling-upgrade 1.3.0 "$OZONE_CURRENT_VERSION"
 # run_test ha non-rolling-upgrade 1.2.1 "$OZONE_CURRENT_VERSION"
 # run_test om-ha non-rolling-upgrade 1.1.0 "$OZONE_CURRENT_VERSION"

diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -60,6 +60,15 @@ services:
       - ../_keytabs:/etc/security/keytabs
       - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
+  old_client_1_4_1:
+    image: ${OZONE_IMAGE}:1.4.1${OZONE_IMAGE_FLAVOR}
+    env_file:
+      - docker-config
+    volumes:
+      - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
+    command: ["sleep","1000000"]
   new_client:
     image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
     env_file:

diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/test.sh b/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
@@ -24,7 +24,7 @@ basename=$(basename ${COMPOSE_DIR})
 # version is used in bucket name, which does not allow uppercase
 current_version="$(echo "${ozone.version}" | sed -e 's/-SNAPSHOT//' | tr '[:upper:]' '[:lower:]')"
 # TODO: debug acceptance test failures for client versions 1.0.0 on secure clusters
-old_versions="1.1.0 1.2.1 1.3.0 1.4.0" # container is needed for each version in clients.yaml
+old_versions="1.1.0 1.2.1 1.3.0 1.4.0 1.4.1" # container is needed for each version in clients.yaml
 
 # shellcheck source=hadoop-ozone/dist/src/main/compose/testlib.sh
 source "${COMPOSE_DIR}/../testlib.sh"