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 88f39dfaf5 HDDS-8991. Extract nodes required for SCM decommission test
(#5066)
88f39dfaf5 is described below
commit 88f39dfaf53f382a5567b4e816e8c8e90db7df88
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Jul 21 14:09:33 2023 +0200
HDDS-8991. Extract nodes required for SCM decommission test (#5066)
---
.../dist/src/main/compose/common/hadoop.yaml | 2 +-
.../dist/src/main/compose/common/s3-haproxy.yaml | 2 +-
.../main/compose/compatibility/docker-compose.yaml | 2 +-
.../src/main/compose/ozone-csi/docker-compose.yaml | 2 +-
.../src/main/compose/ozone-ha/docker-compose.yaml | 2 +-
.../main/compose/ozone-om-ha/docker-compose.yaml | 2 +-
.../compose/ozone-om-prepare/docker-compose.yaml | 2 +-
.../compose/ozone-topology/docker-compose.yaml | 2 +-
.../src/main/compose/ozone/docker-compose.yaml | 2 +-
.../dist/src/main/compose/ozone/freon-ockg.yaml | 2 +-
.../dist/src/main/compose/ozone/freon-rk.yaml | 2 +-
.../dist/src/main/compose/ozone/legacy-bucket.yaml | 2 +-
.../dist/src/main/compose/ozone/monitoring.yaml | 2 +-
.../dist/src/main/compose/ozone/profiling.yaml | 2 +-
.../main/compose/ozoneblockade/docker-compose.yaml | 2 +-
.../main/compose/ozonescripts/docker-compose.yaml | 2 +-
.../compose/ozonesecure-ha/docker-compose.yaml | 55 +---------------
.../compose/ozonesecure-ha/root-ca-rotation.yaml | 2 +-
.../compose/ozonesecure-ha/scm-decommission.yaml | 76 ++++++++++++++++++++++
.../ozonesecure-ha/test-root-ca-rotation.sh | 2 +-
.../{test.sh => test-scm-decommission.sh} | 29 +--------
.../dist/src/main/compose/ozonesecure-ha/test.sh | 19 ------
.../compose/ozonesecure-mr/docker-compose.yaml | 2 +-
.../compose/ozonesecure/certificate-rotation.yaml | 2 +-
.../main/compose/ozonesecure/docker-compose.yaml | 2 +-
.../dist/src/main/compose/ozonesecure/fcq.yaml | 2 +-
.../main/compose/ozonesecure/root-ca-rotation.yaml | 2 +-
.../dist/src/main/compose/ozonesecure/vault.yaml | 2 +-
.../src/main/compose/restart/docker-compose.yaml | 2 +-
.../compose/upgrade/compose/ha/docker-compose.yaml | 2 +-
.../upgrade/compose/non-ha/docker-compose.yaml | 2 +-
.../upgrade/compose/om-ha/docker-compose.yaml | 2 +-
.../dist/src/main/compose/xcompat/clients.yaml | 2 +-
.../dist/src/main/compose/xcompat/new-cluster.yaml | 2 +-
.../dist/src/main/compose/xcompat/old-cluster.yaml | 2 +-
35 files changed, 109 insertions(+), 132 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop.yaml
b/hadoop-ozone/dist/src/main/compose/common/hadoop.yaml
index 6d3cc3d4fb..ce04592440 100644
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop.yaml
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
services:
rm:
image: ${HADOOP_IMAGE}:${HADOOP_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/common/s3-haproxy.yaml
b/hadoop-ozone/dist/src/main/compose/common/s3-haproxy.yaml
index abc9011fb6..e77534c31f 100644
--- a/hadoop-ozone/dist/src/main/compose/common/s3-haproxy.yaml
+++ b/hadoop-ozone/dist/src/main/compose/common/s3-haproxy.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-s3-worker:
&s3-worker
diff --git
a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
index f76b5e1891..1a4584cd57 100644
--- a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
index fd99d01b0c..100585d57c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
services:
datanode:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
index 1e1d48d133..d5de2b1cbd 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
index 69536c29df..38e8eb7e8d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
datanode:
build:
diff --git
a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
index e0d6d471af..388809f820 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git
a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
index 79dbbde5bd..cb86044446 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
datanode_1:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index 15dea75d83..76f26ddda8 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
index 62dabda57e..d551625e86 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
services:
freon:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
index 10a21b07ef..c48266c660 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
services:
freon:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/legacy-bucket.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/legacy-bucket.yaml
index c893c16799..d2d57c99ef 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/legacy-bucket.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/legacy-bucket.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-legacy-bucket-config:
&legacy-bucket-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
index e08cc8ec5a..4a0e8f067c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-monitoring-config:
&monitoring-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/profiling.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/profiling.yaml
index f3f14f6288..0f71efeec7 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/profiling.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/profiling.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-profiling-config:
&profiling-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
index b3d21dd76f..b7852b9f0f 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
datanode:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
index 786fce8b2b..a30405df0d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
datanode:
build:
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
index a13c0b2f50..05974aa83b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
kdc:
image: ${OZONE_TESTKRB5_IMAGE}
@@ -301,59 +301,6 @@ services:
networks:
ozone_net:
ipv4_address: 172.25.0.118
- scm4.org:
- image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
- hostname: scm4.org
- volumes:
- - ../..:/opt/hadoop
- - ../_keytabs:/etc/security/keytabs
- - ./krb5.conf:/etc/krb5.conf
- ports:
- - 10004:9876
- - 10006:9860
- env_file:
- - docker-config
- - docker-config-scm4
- environment:
- ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
- OZONE_OPTS:
- command: [ "/opt/hadoop/bin/ozone","scm" ]
- extra_hosts:
- - "om1: 172.25.0.111"
- - "om2: 172.25.0.112"
- - "om3: 172.25.0.113"
- - "scm1.org: 172.25.0.116"
- - "scm2.org: 172.25.0.117"
- - "scm3.org: 172.25.0.118"
- networks:
- ozone_net:
- ipv4_address: 172.25.0.120
- profiles: ["scm4.org"]
- datanode4:
- image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- - ../_keytabs:/etc/security/keytabs
- - ./krb5.conf:/etc/krb5.conf
- ports:
- - 10008:9999
- command: [ "/opt/hadoop/bin/ozone","datanode" ]
- extra_hosts:
- - "scm1.org: 172.25.0.116"
- - "scm2.org: 172.25.0.117"
- - "scm3.org: 172.25.0.118"
- - "scm4.org: 172.25.0.120"
- - "recon: 172.25.0.115"
- env_file:
- - docker-config
- - docker-config-scm4
- environment:
- WAITFOR: scm4.org:9894
- OZONE_OPTS:
- networks:
- ozone_net:
- ipv4_address: 172.25.0.121
- profiles: [ "datanode4" ]
recon:
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
hostname: recon
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/root-ca-rotation.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/root-ca-rotation.yaml
index 0ca8d10c24..71d0ee95b7 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/root-ca-rotation.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/root-ca-rotation.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-root-cert-rotation-config:
&root-cert-rotation-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml
new file mode 100644
index 0000000000..8a1e2b3f2f
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "3.8"
+services:
+ scm4.org:
+ image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
+ hostname: scm4.org
+ volumes:
+ - ../..:/opt/hadoop
+ - ../_keytabs:/etc/security/keytabs
+ - ./krb5.conf:/etc/krb5.conf
+ ports:
+ - 10004:9876
+ - 10006:9860
+ env_file:
+ - docker-config
+ - docker-config-scm4
+ environment:
+ ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
+ OZONE_OPTS:
+ command: [ "/opt/hadoop/bin/ozone","scm" ]
+ extra_hosts:
+ - "om1: 172.25.0.111"
+ - "om2: 172.25.0.112"
+ - "om3: 172.25.0.113"
+ - "scm1.org: 172.25.0.116"
+ - "scm2.org: 172.25.0.117"
+ - "scm3.org: 172.25.0.118"
+ networks:
+ ozone_net:
+ ipv4_address: 172.25.0.120
+ profiles: ["scm4.org"]
+ datanode4:
+ image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
+ volumes:
+ - ../..:/opt/hadoop
+ - ../_keytabs:/etc/security/keytabs
+ - ./krb5.conf:/etc/krb5.conf
+ ports:
+ - 10008:9999
+ command: [ "/opt/hadoop/bin/ozone","datanode" ]
+ extra_hosts:
+ - "scm1.org: 172.25.0.116"
+ - "scm2.org: 172.25.0.117"
+ - "scm3.org: 172.25.0.118"
+ - "scm4.org: 172.25.0.120"
+ - "recon: 172.25.0.115"
+ env_file:
+ - docker-config
+ - docker-config-scm4
+ environment:
+ OZONE_OPTS:
+ networks:
+ ozone_net:
+ ipv4_address: 172.25.0.121
+ profiles: [ "datanode4" ]
+networks:
+ ozone_net:
+ ipam:
+ driver: default
+ config:
+ - subnet: "172.25.0.0/24"
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-root-ca-rotation.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-root-ca-rotation.sh
index 2a851b2cb7..4443a1ea8d 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-root-ca-rotation.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-root-ca-rotation.sh
@@ -23,7 +23,7 @@ export COMPOSE_DIR
export SECURITY_ENABLED=true
export OM_SERVICE_ID="omservice"
export SCM=scm1.org
-export COMPOSE_FILE=docker-compose.yaml:root-ca-rotation.yaml
+export
COMPOSE_FILE=docker-compose.yaml:scm-decommission.yaml:root-ca-rotation.yaml
: ${OZONE_BUCKET_KEY_NAME:=key1}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
old mode 100755
new mode 100644
similarity index 72%
copy from hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
copy to
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
index 07adaa4f4a..41a714dbc6
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
@@ -23,40 +23,13 @@ export COMPOSE_DIR
export SECURITY_ENABLED=true
export OM_SERVICE_ID="omservice"
export SCM=scm1.org
-
-: ${OZONE_BUCKET_KEY_NAME:=key1}
+export COMPOSE_FILE=docker-compose.yaml:scm-decommission.yaml
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
start_docker_env
-execute_command_in_container kms hadoop key create ${OZONE_BUCKET_KEY_NAME}
-
-execute_robot_test s3g kinit.robot
-
-execute_robot_test s3g freon
-
-execute_robot_test s3g -v SCHEME:o3fs -v BUCKET_TYPE:link -N ozonefs-o3fs-link
ozonefs/ozonefs.robot
-
-execute_robot_test s3g basic/links.robot
-
-exclude=""
-for bucket in encrypted link; do
- execute_robot_test s3g -v BUCKET:${bucket} -N s3-${bucket} ${exclude} s3
- # some tests are independent of the bucket type, only need to be run once
- exclude="--exclude no-bucket-type"
-done
-
-execute_robot_test s3g admincli
-
-execute_robot_test s3g omha/om-leader-transfer.robot
-
-execute_robot_test s3g httpfs
-
-export SCM=scm2.org
-execute_robot_test s3g admincli
-
# bootstrap new SCM4
docker-compose up -d scm4.org
wait_for_port scm4.org 9894 120
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
index 07adaa4f4a..70d45b33c6 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
@@ -56,22 +56,3 @@ execute_robot_test s3g httpfs
export SCM=scm2.org
execute_robot_test s3g admincli
-
-# bootstrap new SCM4
-docker-compose up -d scm4.org
-wait_for_port scm4.org 9894 120
-execute_robot_test scm4.org kinit.robot
-wait_for_execute_command scm4.org 120 "ozone admin scm roles | grep scm4.org"
-execute_robot_test scm4.org scmha/primordial-scm.robot
-
-# add new datanode4
-docker-compose up -d datanode4
-wait_for_port datanode4 9856 120
-wait_for_execute_command scm4.org 60 "ozone admin datanode list | grep
datanode4"
-
-# decommission primordial node scm1.org
-SCMID=$(execute_command_in_container scm4.org bash -c "ozone admin scm roles"
| grep scm4 | awk -F: '{print $4}')
-docker-compose stop scm4.org
-execute_robot_test scm3.org kinit.robot
-wait_for_execute_command scm3.org 60 "ozone admin scm decommission
--nodeid=${SCMID} | grep Decommissioned"
-execute_robot_test scm3.org scmha/scm-decommission.robot
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
index 94059319ff..abba9ad537 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.5"
+version: "3.8"
services:
kdc:
image: ${OZONE_TESTKRB5_IMAGE}
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure/certificate-rotation.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/certificate-rotation.yaml
index 85586a1844..4b953f6343 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/certificate-rotation.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/certificate-rotation.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-cert-rotation-config:
&cert-rotation-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
index 4e32e9339f..d50101bcc0 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
kdc:
image: ${OZONE_TESTKRB5_IMAGE}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/fcq.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/fcq.yaml
index 6450490052..e074d7df48 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/fcq.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/fcq.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-FCQ-config:
&FCQ-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure/root-ca-rotation.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/root-ca-rotation.yaml
index bb51f80261..9b998b7f1d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/root-ca-rotation.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/root-ca-rotation.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
x-root-cert-rotation-config:
&root-cert-rotation-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/vault.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/vault.yaml
index cf5be8df6a..e429510fd1 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/vault.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/vault.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3"
+version: "3.8"
services:
om:
env_file:
diff --git a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
index 7e79667ebc..f41ca916d0 100644
--- a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
index af0566aac8..38f03455d6 100644
--- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
index 7f35733dc2..6a195cf807 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
index d4f97885aa..39d0b2d895 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-common-config:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
index 84f0523d60..15d4c7e427 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
services:
old_client_1_0_0:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
index 95921f115d..6014ec0d51 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-new-config:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
index 0963057df4..22441e99c8 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: "3.4"
+version: "3.8"
# reusable fragments (see
https://docs.docker.com/compose/compose-file/#extension-fields)
x-old-config:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
