Skip to content

Commit 82465d0

Browse files
committed
Fix kuttl cleanup timeout in tempest-basic test
The 99-cleanup step was timing out (600s) because it checked for the absence of openstack-config ConfigMap and openstack-config-secret Secret. These are infrastructure resources managed by the CI environment, not by the test-operator. Other operators (e.g. keystone) in the namespace recreate them after deletion, causing the error check to never pass. Also fix Pod label selectors in errors-cleanup.yaml from job-name to instanceName, which is the label actually set by the test-operator. Signed-off-by: Vito Castellano <vcastell@redhat.com>
1 parent 69a43bb commit 82465d0

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

test/kuttl/common/cleanup-all-tests.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
33
delete:
4-
- apiVersion: v1
5-
kind: ConfigMap
6-
name: openstack-config
7-
- apiVersion: v1
8-
kind: Secret
9-
name: openstack-config-secret
104
- apiVersion: test.openstack.org/v1beta1
115
kind: Tempest
126
name: tempest-sample

test/kuttl/common/errors-cleanup.yaml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@
22
# Check for:
33
#
44
# No CRs
5-
# No Pods
6-
# No ConfigMaps
7-
# No Secrets
5+
# No Pods owned by test-operator
6+
#
7+
# NOTE: openstack-config ConfigMap and openstack-config-secret Secret are
8+
# infrastructure resources managed by the CI environment (not by the
9+
# test-operator) and must NOT be checked here. Other operators in the
10+
# namespace may recreate them after deletion, causing cleanup timeouts.
811
#
9-
apiVersion: v1
10-
kind: ConfigMap
11-
metadata:
12-
name: openstack-config
13-
---
14-
apiVersion: v1
15-
kind: Secret
16-
metadata:
17-
name: openstack-config-secret
18-
---
1912
apiVersion: test.openstack.org/v1beta1
2013
kind: Tempest
2114
metadata:
@@ -40,22 +33,22 @@ apiVersion: v1
4033
kind: Pod
4134
metadata:
4235
labels:
43-
job-name: tempest-sample
36+
instanceName: tempest-sample
4437
---
4538
apiVersion: v1
4639
kind: Pod
4740
metadata:
4841
labels:
49-
job-name: tobiko-sample
42+
instanceName: tobiko-sample
5043
---
5144
apiVersion: v1
5245
kind: Pod
5346
metadata:
5447
labels:
55-
job-name: ansibletest-sample
48+
instanceName: ansibletest-sample
5649
---
5750
apiVersion: v1
5851
kind: Pod
5952
metadata:
6053
labels:
61-
job-name: horizontest-sample
54+
instanceName: horizontest-sample

0 commit comments

Comments
 (0)