Skip to content

Commit 8829db1

Browse files
committed
Do not deploy additional ceph services
Glance tempest job doesn't need a full ceph deployment. This patch adds the cifmw variables to skip rgw, dashboard and cephfs deployment. Signed-off-by: Francesco Pantano <[email protected]>
1 parent d812430 commit 8829db1

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ commands:
66
- script: |
77
oc -n $NAMESPACE kustomize --load-restrictor LoadRestrictionsNone ../../../../config/samples/openstackclient | oc -n $NAMESPACE delete -f -
88
- script: |
9-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
9+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
1010
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ commands:
44
- script: |
55
oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
66
- script: |
7-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
7+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
88
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ commands:
44
- script: |
55
oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
66
- script: |
7-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
7+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
88
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ commands:
44
- script: |
55
oc kustomize ../../../../config/samples/layout/single | oc delete -n $NAMESPACE -f -
66
- script: |
7-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
7+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
88
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ commands:
44
- script: |
55
oc kustomize ../../../../config/samples/layout/split | oc delete -n $NAMESPACE -f -
66
- script: |
7-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
7+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
88
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ commands:
44
- script: |
55
oc kustomize ../../../../config/samples/layout/split | oc delete -n $NAMESPACE -f -
66
- script: |
7-
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc
7+
oc get pvc -l service=glance -o custom-columns=NAME:.metadata.name --no-headers | xargs -n 1 oc -n $NAMESPACE delete pvc;
88
for pv in $(oc get pv | grep "Released.*glance" | cut -f 1 -d " "); do oc patch pv $pv -p '{"spec":{"claimRef": null}}'; done

zuul.d/jobs.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
name: glance-operator-tempest
2828
parent: podified-multinode-hci-deployment-crc-1comp-backends
2929
vars:
30+
cifmw_ceph_daemons_layout:
31+
rgw_enabled: false
32+
dashboard_enabled: false
33+
cephfs_enabled: false
34+
ceph_nfs_enabled: false
3035
cifmw_install_yamls_sdk_version: v1.41.1
3136
cifmw_test_operator_tempest_concurrency: 3
3237
cifmw_test_operator_tempest_include_list: |

0 commit comments

Comments
 (0)