From 2a09c0fbe4027dbe21d2537e0e7b317797a2068d Mon Sep 17 00:00:00 2001 From: Michael Davis <michael.davis@cern.ch> Date: Thu, 6 May 2021 10:29:22 +0200 Subject: [PATCH] [ci] Changes cta-admin sc --copynb to --numberofcopies --- continuousintegration/orchestration/tests/prepare_tests.sh | 2 +- .../orchestration/tests/repack_systemtest_wrapper.sh | 2 +- continuousintegration/orchestration/tests/simpletest.cli.sh | 2 +- continuousintegration/orchestration/tests/systest.sh | 4 ++-- .../tests/systest_xrdcp_many_concurrent_files.sh | 4 ++-- .../orchestration/tests/systest_xrdcp_many_files.sh | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/continuousintegration/orchestration/tests/prepare_tests.sh b/continuousintegration/orchestration/tests/prepare_tests.sh index ec3f90c960..f908d33f48 100755 --- a/continuousintegration/orchestration/tests/prepare_tests.sh +++ b/continuousintegration/orchestration/tests/prepare_tests.sh @@ -169,7 +169,7 @@ kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin --json version | jq done kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin storageclass add \ --name ctaStorageClass \ - --copynb 1 \ + --numberofcopies 1 \ --vo vo \ --comment "ctasystest" kubectl --namespace ${NAMESPACE} exec ctacli -- cta-admin archiveroute add \ diff --git a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh index d1e2e7eb94..c8f1708f27 100755 --- a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh +++ b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh @@ -328,7 +328,7 @@ repackMoveAndAddCopies() { storageClassName=`kubectl -n ${NAMESPACE} exec ctacli -- cta-admin --json storageclass ls | jq -r ". [0] | .name"` echo "Changing the storage class $storageClassName nb copies" - kubectl -n ${NAMESPACE} exec ctacli -- cta-admin storageclass ch --name $storageClassName --copynb 3 + kubectl -n ${NAMESPACE} exec ctacli -- cta-admin storageclass ch --name $storageClassName --numberofcopies 3 echo "OK" echo "Putting all drives up" diff --git a/continuousintegration/orchestration/tests/simpletest.cli.sh b/continuousintegration/orchestration/tests/simpletest.cli.sh index ce36c0f0c4..f7b44dd7eb 100755 --- a/continuousintegration/orchestration/tests/simpletest.cli.sh +++ b/continuousintegration/orchestration/tests/simpletest.cli.sh @@ -8,7 +8,7 @@ cta tapepool add --name ctasystest --partialtapesnumber 5 --encrypted false --co cta tape add --logicallibrary VLSTK --tapepool ctasystest --capacity 1000000000 --comment "ctasystest" --vid ${VID} --full false -cta storageclass add --instance root --name ctaStorageClass --copynb 1 --comment "ctasystest" +cta storageclass add --instance root --name ctaStorageClass --numberofcopies 1 --comment "ctasystest" cta archiveroute add --instance root --storageclass ctaStorageClass --copynb 1 --tapepool ctasystest --comment "ctasystest" diff --git a/continuousintegration/orchestration/tests/systest.sh b/continuousintegration/orchestration/tests/systest.sh index 48945ccfec..5da9ae0a3e 100755 --- a/continuousintegration/orchestration/tests/systest.sh +++ b/continuousintegration/orchestration/tests/systest.sh @@ -81,8 +81,8 @@ echo "Preparing CTA for tests" done kubectl --namespace ${NAMESPACE} exec ctacli -- cta storageclass add \ --instance ${EOSINSTANCE} \ - --name ctaStorageClass \ - --copynb 1 \ + --name ctaStorageClass \ + --numberofcopies 1 \ --comment "ctasystest" kubectl --namespace ${NAMESPACE} exec ctacli -- cta archiveroute add \ --instance ${EOSINSTANCE} \ diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh index 92e8207b50..e93e03349b 100755 --- a/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh +++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh @@ -84,8 +84,8 @@ done kubectl --namespace ${NAMESPACE} exec ctacli -- cta storageclass add \ --instance ${EOSINSTANCE} \ - --name ctaStorageClass \ - --copynb 1 \ + --name ctaStorageClass \ + --numberofcopies 1 \ --comment "ctasystest" kubectl --namespace ${NAMESPACE} exec ctacli -- cta archiveroute add \ --instance ${EOSINSTANCE} \ diff --git a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh index 27ba8c1779..45a0b2f92c 100755 --- a/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh +++ b/continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh @@ -82,8 +82,8 @@ done kubectl --namespace ${NAMESPACE} exec ctacli -- cta storageclass add \ --instance ${EOSINSTANCE} \ - --name ctaStorageClass \ - --copynb 1 \ + --name ctaStorageClass \ + --numberofcopies 1 \ --comment "ctasystest" kubectl --namespace ${NAMESPACE} exec ctacli -- cta archiveroute add \ --instance ${EOSINSTANCE} \ -- GitLab