From 70cc4282b5d070a56d510f8d2640f1cf902f0784 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Mon, 18 Jul 2022 12:22:26 +0300 Subject: [PATCH 1/9] remove tests to skip Signed-off-by: ArbelNathan --- scripts/csi_test/community_svc_csi_tests_to_skip | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/csi_test/community_svc_csi_tests_to_skip b/scripts/csi_test/community_svc_csi_tests_to_skip index 572a33b98..e69de29bb 100644 --- a/scripts/csi_test/community_svc_csi_tests_to_skip +++ b/scripts/csi_test/community_svc_csi_tests_to_skip @@ -1,4 +0,0 @@ -should create volume from an existing source snapshot -should create volume from an existing source volume -should succeed when requesting to create a snapshot with already existing name and same source volume ID -should fail when requesting to create a snapshot with already existing name and different source volume ID From f6e6f8473141e71800ce871a8d7b9286c37d5636 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 11:33:36 +0300 Subject: [PATCH 2/9] remove tests to skip ds8k Signed-off-by: ArbelNathan --- scripts/csi_test/community_ds8k_csi_tests_to_skip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/csi_test/community_ds8k_csi_tests_to_skip b/scripts/csi_test/community_ds8k_csi_tests_to_skip index a48deba96..8b1378917 100644 --- a/scripts/csi_test/community_ds8k_csi_tests_to_skip +++ b/scripts/csi_test/community_ds8k_csi_tests_to_skip @@ -1 +1 @@ -should create volume from an existing source snapshot + From 6b48ae8b4f1abbfd532ba48737dea5212bb46be9 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 11:42:30 +0300 Subject: [PATCH 3/9] remove empty line Signed-off-by: ArbelNathan --- scripts/csi_test/community_ds8k_csi_tests_to_skip | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/csi_test/community_ds8k_csi_tests_to_skip b/scripts/csi_test/community_ds8k_csi_tests_to_skip index 8b1378917..e69de29bb 100644 --- a/scripts/csi_test/community_ds8k_csi_tests_to_skip +++ b/scripts/csi_test/community_ds8k_csi_tests_to_skip @@ -1 +0,0 @@ - From 3e55ef1720488e16dc507c331e14dbc986ffd390 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 14:00:55 +0300 Subject: [PATCH 4/9] revert ds8k and work with virt_snap_func Signed-off-by: ArbelNathan --- scripts/csi_test/community_ds8k_csi_tests_to_skip | 1 + scripts/csi_test/csi_params_thin | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/csi_test/community_ds8k_csi_tests_to_skip b/scripts/csi_test/community_ds8k_csi_tests_to_skip index e69de29bb..a48deba96 100644 --- a/scripts/csi_test/community_ds8k_csi_tests_to_skip +++ b/scripts/csi_test/community_ds8k_csi_tests_to_skip @@ -0,0 +1 @@ +should create volume from an existing source snapshot diff --git a/scripts/csi_test/csi_params_thin b/scripts/csi_test/csi_params_thin index 0d9dfe22e..43a6cb67e 100644 --- a/scripts/csi_test/csi_params_thin +++ b/scripts/csi_test/csi_params_thin @@ -1,3 +1,4 @@ SpaceEfficiency: thin pool: POOL_NAME +virt_snap_func: "true" #volume_name_prefix: From 7ca3ce572580df2f1f69503f3b0fbdb857347f9b Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 17:34:18 +0300 Subject: [PATCH 5/9] work with virt_snap_func in snapshotclass Signed-off-by: ArbelNathan --- Dockerfile-csi-test | 1 + scripts/csi_test/csi_snapshot_params | 1 + scripts/csi_test/entrypoint-csi-tests.sh | 1 + 3 files changed, 3 insertions(+) create mode 100644 scripts/csi_test/csi_snapshot_params diff --git a/Dockerfile-csi-test b/Dockerfile-csi-test index cb347ca5c..c0a06cc1e 100644 --- a/Dockerfile-csi-test +++ b/Dockerfile-csi-test @@ -31,6 +31,7 @@ WORKDIR /usr/local/go/src/github.com/kubernetes-csi/csi-test ENV JUNIT_OUTPUT="/tmp/test_results/out_client.xml" ENV SECRET_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_secrets" ENV PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/${CSI_PARAMS}" +ENV SNAPSHOT_PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_snapshot_params}" ENV ENDPOINT="/tmp/k8s_dir/nodecsi" ENV ENDPOINT_CONTROLLER="/tmp/k8s_dir/f" ENV TESTS_TO_SKIP_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_tests_to_skip" diff --git a/scripts/csi_test/csi_snapshot_params b/scripts/csi_test/csi_snapshot_params new file mode 100644 index 000000000..1e56d027d --- /dev/null +++ b/scripts/csi_test/csi_snapshot_params @@ -0,0 +1 @@ +virt_snap_func: "true" diff --git a/scripts/csi_test/entrypoint-csi-tests.sh b/scripts/csi_test/entrypoint-csi-tests.sh index a75b0f72c..ea568dac8 100755 --- a/scripts/csi_test/entrypoint-csi-tests.sh +++ b/scripts/csi_test/entrypoint-csi-tests.sh @@ -16,6 +16,7 @@ TESTS=`cat ${TESTS_TO_SKIP_FILE}| sed -Ez '$ s/\n+$//' | tr '\n' "|"` --csi.controllerendpoint ${ENDPOINT_CONTROLLER} \ --csi.secrets ${SECRET_FILE} \ --csi.testvolumeparameters ${PARAM_FILE} \ +--csi.testsnapshotparameters ${SNAPSHOT_PARAM_FILE} \ --csi.junitfile ${JUNIT_OUTPUT} \ --ginkgo.v \ --ginkgo.debug \ From d36df7131877e8a0a49ab15bdf45b35131b8895d Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 20:23:53 +0300 Subject: [PATCH 6/9] fix path Signed-off-by: ArbelNathan --- Dockerfile-csi-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-csi-test b/Dockerfile-csi-test index c0a06cc1e..82b1e776c 100644 --- a/Dockerfile-csi-test +++ b/Dockerfile-csi-test @@ -31,7 +31,7 @@ WORKDIR /usr/local/go/src/github.com/kubernetes-csi/csi-test ENV JUNIT_OUTPUT="/tmp/test_results/out_client.xml" ENV SECRET_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_secrets" ENV PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/${CSI_PARAMS}" -ENV SNAPSHOT_PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_snapshot_params}" +ENV SNAPSHOT_PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_snapshot_params" ENV ENDPOINT="/tmp/k8s_dir/nodecsi" ENV ENDPOINT_CONTROLLER="/tmp/k8s_dir/f" ENV TESTS_TO_SKIP_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_tests_to_skip" From fd26baef7ee939c6fa82b1eaf06af29f80404ed2 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Tue, 19 Jul 2022 20:39:38 +0300 Subject: [PATCH 7/9] add pool Signed-off-by: ArbelNathan --- scripts/csi_test/csi_snapshot_params | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/csi_test/csi_snapshot_params b/scripts/csi_test/csi_snapshot_params index 1e56d027d..6b0dfe79d 100644 --- a/scripts/csi_test/csi_snapshot_params +++ b/scripts/csi_test/csi_snapshot_params @@ -1 +1,2 @@ virt_snap_func: "true" +pool: POOL_NAME From 8e2273f86293b78472fbea9db9cf93c4cffce5f0 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Wed, 20 Jul 2022 10:20:18 +0300 Subject: [PATCH 8/9] add pool in entrypoint-csi-tests.sh Signed-off-by: ArbelNathan --- scripts/csi_test/entrypoint-csi-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/csi_test/entrypoint-csi-tests.sh b/scripts/csi_test/entrypoint-csi-tests.sh index ea568dac8..5ba7c7f04 100755 --- a/scripts/csi_test/entrypoint-csi-tests.sh +++ b/scripts/csi_test/entrypoint-csi-tests.sh @@ -7,6 +7,7 @@ sed -i -e "s/PASSWORD/${PASSWORD}/g" ${SECRET_FILE} echo "update params file" sed -i -e "s/POOL_NAME/${POOL_NAME}/g" ${PARAM_FILE} +sed -i -e "s/POOL_NAME/${POOL_NAME}/g" ${SNAPSHOT_PARAM_FILE} # get tests to skip TESTS=`cat ${TESTS_TO_SKIP_FILE}| sed -Ez '$ s/\n+$//' | tr '\n' "|"` From 785f447bc612ed76a9fd67fdf410a1ba5caccfd2 Mon Sep 17 00:00:00 2001 From: ArbelNathan Date: Sun, 4 Sep 2022 09:46:18 +0300 Subject: [PATCH 9/9] revert changes to match #567 Signed-off-by: ArbelNathan --- scripts/csi_test/csi_params_thin | 1 - scripts/csi_test/csi_snapshot_params | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 scripts/csi_test/csi_snapshot_params diff --git a/scripts/csi_test/csi_params_thin b/scripts/csi_test/csi_params_thin index 43a6cb67e..0d9dfe22e 100644 --- a/scripts/csi_test/csi_params_thin +++ b/scripts/csi_test/csi_params_thin @@ -1,4 +1,3 @@ SpaceEfficiency: thin pool: POOL_NAME -virt_snap_func: "true" #volume_name_prefix: diff --git a/scripts/csi_test/csi_snapshot_params b/scripts/csi_test/csi_snapshot_params deleted file mode 100644 index 6b0dfe79d..000000000 --- a/scripts/csi_test/csi_snapshot_params +++ /dev/null @@ -1,2 +0,0 @@ -virt_snap_func: "true" -pool: POOL_NAME