You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2026/09/24 13:26:59 UTC
(ozone) branch master updated: HDDS-16498. Run sts and other Ranger tests in same split (#11254)
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 995e9389fdd HDDS-16498. Run sts and other Ranger tests in same split (#11254)
995e9389fdd is described below
commit 995e9389fdd1243f7ff6f9b377a9484d4a0172d9
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu Sep 24 15:26:52 2026 +0200
HDDS-16498. Run sts and other Ranger tests in same split (#11254)
---
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-setup.sh | 2 --
.../dist/src/main/compose/ozonesecure-ha/polaris-smoketest.sh | 3 +--
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/ranger.yaml | 5 +----
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-sts.sh | 2 +-
6 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-setup.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-setup.sh
index 951d9576ce1..80e09ebc632 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-setup.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-setup.sh
@@ -17,8 +17,6 @@
set -eu
-apk add --no-cache jq >/dev/null
-
realm="${POLARIS_REALM:-POLARIS}"
catalog_name="${POLARIS_CATALOG_NAME:-quickstart_catalog}"
storage_location="${POLARIS_STORAGE_LOCATION:-s3://iceberg-obs/polaris-smoke}"
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-smoketest.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-smoketest.sh
index a53bb9e9a47..1e170e1867a 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-smoketest.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris-smoketest.sh
@@ -21,8 +21,7 @@ COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
if [[ -z "${RANGER_VERSION:-}" ]]; then
- # shellcheck source=/dev/null
- source "${COMPOSE_DIR}/.env"
+ export RANGER_VERSION="${ranger.version}"
fi
# shellcheck source=/dev/null
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris.yaml
index c22db238025..2d13faa54dd 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/polaris.yaml
@@ -44,7 +44,7 @@ services:
ipv4_address: 172.25.0.124
polaris-setup:
- image: alpine/curl:8.19.0
+ image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
dns_search: .
depends_on:
polaris:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/ranger.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/ranger.yaml
index 2dad84dbb5f..e5699d75bf3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/ranger.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/ranger.yaml
@@ -39,10 +39,7 @@ x-om-ranger-config:
- ${RANGER_OZONE_PLUGIN_DIR}:/opt/ranger/ozone-plugin
tmpfs:
- /opt/ozone/conf
- # JDK17+ no longer ships javax.annotation, but the Ranger Ozone plugin's Jersey2
- # client needs javax.annotation.Priority. Copy the jar into the plugin impl dir
- # so the isolated RangerPluginClassLoader can find it.
- command: bash -c 'sudo mkdir -p /opt/ranger/ozone-plugin/lib/libext/ranger-ozone-plugin-impl && for j in /opt/hadoop/share/ozone/lib/javax.annotation-api-*.jar; do [ -e "$$j" ] || continue; dest="/opt/ranger/ozone-plugin/lib/libext/ranger-ozone-plugin-impl/$$(basename "$$j")"; sudo test -e "$$dest" || sudo cp -n "$$j" "$$dest" || sudo test -e "$$dest"; done && sudo --preserve-env /opt/ranger/ozone-plugin/enable-ozone-plugin.sh && exec /opt/hadoop/bin/ozone om'
+ command: bash -c 'sudo --preserve-env /opt/ranger/ozone-plugin/enable-ozone-plugin.sh && exec /opt/hadoop/bin/ozone om'
services:
om1:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh
index 7d6950ccaa7..3ef326ca0d7 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-ranger.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:misc
+#suite:ranger
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-sts.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-sts.sh
index 879dd1b5851..ffb277b79ac 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-sts.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-sts.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:sts
+#suite:ranger
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org