Merge pull request #838 from fmount/kuttl_zuul_fix

Delete allocated PVCs after each kuttl test execution

Author: openshift-merge-bot[bot]

kuttl-test.yaml

@@ -14,7 +14,7 @@ kind: TestSuite
 reportFormat: xml
 reportName: kuttl-report-glance
 reportGranularity: test
-timeout: 180
+timeout: 240
 namespace: glance-kuttl-tests
 parallel: 1
 suppress:

test/kuttl/tests/glance_dist_image_import/02-cleanup.yaml

@@ -5,3 +5,6 @@ commands:
       oc -n $NAMESPACE kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
   - script: |
       oc -n $NAMESPACE kustomize --load-restrictor LoadRestrictionsNone ../../../../config/samples/openstackclient | oc -n $NAMESPACE delete -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

test/kuttl/tests/glance_image_cache/04-cleanup-glance.yaml

@@ -3,3 +3,6 @@ kind: TestStep
 commands:
   - script: |
       oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

test/kuttl/tests/glance_single/05-cleanup-glance.yaml

@@ -3,3 +3,6 @@ kind: TestStep
 commands:
   - script: |
       oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

test/kuttl/tests/glance_single_tls/05-cleanup-glance.yaml

@@ -3,3 +3,6 @@ kind: TestStep
 commands:
   - script: |
       oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

test/kuttl/tests/glance_split/05-cleanup-glance.yaml

@@ -3,3 +3,6 @@ kind: TestStep
 commands:
   - script: |
       oc kustomize ../../../../config/samples/layout/split | oc delete -n $NAMESPACE -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

test/kuttl/tests/glance_split_proxypass/05-cleanup-glance.yaml

@@ -3,3 +3,6 @@ kind: TestStep
 commands:
   - script: |
       oc kustomize ../../../../config/samples/layout/split | oc delete -n $NAMESPACE -f -
+  - script: |
+      oc -n $NAMESPACE get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
+      for pv in $(oc -n $NAMESPACE get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc -n $NAMESPACE patch pv $pv -p '{"spec":{"claimRef": null}}'; done

zuul.d/jobs.yaml

@@ -17,16 +17,19 @@
       - ^renovate.json$
     vars:
       cifmw_install_yamls_sdk_version: v1.41.1
-      cifmw_kuttl_tests_env_vars:
-        CEPH_TIMEOUT: 90
-        PV_NUM: 20
+      cifmw_cls_pv_count: 20
       cifmw_kuttl_tests_operator_list:
         - glance
 
 - job:
     name: glance-operator-tempest
     parent: podified-multinode-hci-deployment-crc-1comp-backends
     vars:
+      cifmw_ceph_daemons_layout:
+        rgw_enabled: false
+        dashboard_enabled: false
+        cephfs_enabled: true
+        ceph_nfs_enabled: false
       cifmw_install_yamls_sdk_version: v1.41.1
       cifmw_test_operator_tempest_concurrency: 3
       cifmw_test_operator_tempest_include_list: |