From 2213cc8daeaca32a7026f094a31efd263a14a3bc Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 2 Dec 2021 12:08:44 +0530 Subject: [PATCH] test: this commit is only for testing This commit is only for testing Signed-off-by: subhamkrai --- .github/workflows/canary-integration-test.yml | 2 +- deploy/examples/create-external-cluster-resources.py | 3 ++- deploy/examples/pool-ec.yaml | 4 ++-- tests/scripts/github-action-helper.sh | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index a122002a1a61e..853d846c74a0d 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -57,7 +57,7 @@ jobs: kubectl -n rook-ceph exec $toolbox -- mkdir -p /etc/ceph/test-data kubectl -n rook-ceph cp tests/ceph-status-out $toolbox:/etc/ceph/test-data/ kubectl -n rook-ceph cp deploy/examples/create-external-cluster-resources.py $toolbox:/etc/ceph - timeout 10 sh -c "until kubectl -n rook-ceph exec $toolbox -- python3 /etc/ceph/create-external-cluster-resources.py --rbd-data-pool-name replicapool; do echo 'waiting for script to succeed' && sleep 1; done" + timeout 10 sh -c "until kubectl -n rook-ceph exec $toolbox -- python3 /etc/ceph/create-external-cluster-resources.py --rbd-data-pool-name=replicapool --rbd-metadata-ec-pool-name=ec-pool; do echo 'waiting for script to succeed' && sleep 1; done" - name: run external script create-external-cluster-resources.py unit tests run: | diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py index 2272cf8afe26a..0331da6559815 100644 --- a/deploy/examples/create-external-cluster-resources.py +++ b/deploy/examples/create-external-cluster-resources.py @@ -218,9 +218,10 @@ def validate_rgw_metadata_ec_pool_name(self): ) cmd_json = { - "prefix": "osd pool ls detail" + "prefix": "osd pool ls detail", "format": "json" } ret_val, json_out, err_msg = self._common_cmd_json_gen(cmd_json) + print(json_out) if ret_val != 0 or len(json_out) == 0: raise ExecutionFailureException( "'osd pool ls detail' command failed.\n" + diff --git a/deploy/examples/pool-ec.yaml b/deploy/examples/pool-ec.yaml index d98f964e52a56..22eaee237d2c2 100644 --- a/deploy/examples/pool-ec.yaml +++ b/deploy/examples/pool-ec.yaml @@ -10,11 +10,11 @@ metadata: namespace: rook-ceph # namespace:cluster spec: # The failure domain will spread the replicas of the data across different failure zones - failureDomain: osd + failureDomain: host # Make sure you have enough OSDs to support the replica size or sum of the erasure coding and data chunks. # This is the minimal example that requires only 3 OSDs. erasureCoded: - dataChunks: 2 + dataChunks: 1 codingChunks: 1 # Set any property on a given pool # see https://docs.ceph.com/docs/master/rados/operations/pools/#set-pool-values diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 25e8ede57fabc..2e5c50750d1ce 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -212,6 +212,7 @@ function deploy_cluster() { kubectl create -f cluster-test.yaml kubectl create -f object-test.yaml kubectl create -f pool-test.yaml + kubectl create -f pool-ec.yaml kubectl create -f filesystem-test.yaml kubectl create -f rbdmirror.yaml kubectl create -f filesystem-mirror.yaml