Skip to content
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
5 changes: 3 additions & 2 deletions hadoop-ozone/dist/src/main/compose/upgrade/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ 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.
run_test non-ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
run_test ha non-rolling-upgrade 2.0.0 "$OZONE_CURRENT_VERSION"
#run_test non-ha non-rolling-upgrade 1.4.1 "$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"
Expand Down
4 changes: 4 additions & 0 deletions hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ services:
image: ${OZONE_IMAGE}:1.4.1${OZONE_IMAGE_FLAVOR}
<<: *old-config

old_client_2_0_0:
image: ${OZONE_IMAGE}:2.0.0${OZONE_IMAGE_FLAVOR}
<<: *old-config

new_client:
<<: *new-config
environment:
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source "${COMPOSE_DIR}/../testlib.sh"

current_version="${OZONE_CURRENT_VERSION}"
# 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 1.4.1" # container is needed for each version in clients.yaml
old_versions="1.1.0 1.2.1 1.3.0 1.4.1 2.0.0" # container is needed for each version in clients.yaml

export SECURITY_ENABLED=true
: ${OZONE_BUCKET_KEY_NAME:=key1}
Expand Down