Skip to content

Commit 5558a88

Browse files
dciabrinopenshift-cherrypick-robot
authored andcommitted
Fix errors in KUTTL tests when running from the top-most directory
. Improve the teardown of every test, so that KUTTL can run the tests in a random order without causing errors due to unexpected resource state. . Improve account and database creation tests so that they can be run from the top-most directory without causing KUTTL errors. . Also remove a test that expects the mariadb-operator runs in a pod on a dedicated namespace. This test doesn't add much coverage and removing it greatly simplifies testing locally during development or CI failure analysis.
1 parent d550fe9 commit 5558a88

File tree

7 files changed

+27
-33
lines changed

7 files changed

+27
-33
lines changed

tests/kuttl/common/assert_sample_deployment.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -130,29 +130,3 @@ apiVersion: v1
130130
kind: ConfigMap
131131
metadata:
132132
name: openstack-config-data
133-
---
134-
apiVersion: kuttl.dev/v1beta1
135-
kind: TestAssert
136-
commands:
137-
- script: |
138-
# when using image digests the containerImage URLs are SHA's so we verify them with a script
139-
tupleTemplate='{{ range (index .spec.template.spec.containers 1).env }}{{ .name }}{{ "#" }}{{ .value}}{{"\n"}}{{ end }}'
140-
imageTuples=$(oc get -n openstack-operators deployment mariadb-operator-controller-manager -o go-template="$tupleTemplate")
141-
# format of imageTuple is: RELATED_IMAGE_MARIADB_<service>#<image URL with SHA> separated by newlines
142-
for ITEM in $(echo $imageTuples); do
143-
# it is an image
144-
if echo $ITEM | grep 'RELATED_IMAGE' &> /dev/null; then
145-
NAME=$(echo $ITEM | sed -e 's|^RELATED_IMAGE_MARIADB_\([^_]*\)_.*|\1|')
146-
IMG_FROM_ENV=$(echo $ITEM | sed -e 's|^.*#\(.*\)|\1|')
147-
template='{{ (index .spec.template.spec.containers 0).image }}'
148-
case $NAME in
149-
IMAGE)
150-
STATEFUL_SET_IMG=$(oc get -n $NAMESPACE statefulset openstack-galera -o go-template="$template")
151-
;;
152-
esac
153-
if [ "$STATEFUL_SET_IMG" != "$IMG_FROM_ENV" ]; then
154-
echo "$NAME image does not equal $VALUE"
155-
exit 1
156-
fi
157-
fi
158-
done

tests/kuttl/tests/account_create/05-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: TestAssert
44
commands:
55
- script: |
66
set -e
7-
${MARIADB_KUTTL_DIR:-tests/kuttl/tests}/../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1
7+
../../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1
88
# ensure db users are configured without TLS connection restriction
99
oc rsh -n ${NAMESPACE} -c galera openstack-galera-0 /bin/sh -c 'mysql -uroot -p${DB_ROOT_PASSWORD} -e "show grants for \`someuser\`@\`%\`;"' | grep 'GRANT USAGE' | grep -v 'REQUIRE SSL'
1010
---

tests/kuttl/tests/account_create/07-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1
33
kind: TestAssert
44
commands:
55
- script: |
6-
${MARIADB_KUTTL_DIR:-tests/kuttl/tests}/../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1 --reverse
6+
../../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1 --reverse

tests/kuttl/tests/database_create/03-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ commands:
1313
# for legacy secret non-present, test that a mariadb username was *not* made
1414
- script: |
1515
set -euxo pipefail
16-
${MARIADB_KUTTL_DIR:-tests/kuttl/tests}/../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_utf8 kuttldb_utf_8 12345678 --reverse
16+
../../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_utf8 kuttldb_utf_8 12345678 --reverse
1717
# for legacy secret present, test that a mariadb username was made
1818
- script: |
1919
set -euxo pipefail
20-
${MARIADB_KUTTL_DIR:-tests/kuttl/tests}/../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_legacy_secret kuttldb_legacy_secret dbsecret1
20+
../../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_legacy_secret kuttldb_legacy_secret dbsecret1
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
delete:
4+
- apiVersion: mariadb.openstack.org/v1beta1
5+
kind: Galera
6+
name: openstack
7+
- apiVersion: v1
8+
kind: Secret
9+
name: kuttl-galera-tls
10+
commands:
11+
- script: |
12+
oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
13+
for i in `oc get pv | awk '/mysql-db.*galera/ {print $1}'`; do oc patch pv $i -p '{"spec":{"claimRef": null}}'; done

tests/kuttl/tests/galera_deploy_tls/03-teardown.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ delete:
77
- apiVersion: v1
88
kind: Secret
99
name: kuttl-galera-tls
10-
- apiVersion: v1
11-
kind: Secret
12-
name: kuttldb-secret
1310
commands:
1411
- script: |
1512
oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
delete:
4+
- apiVersion: mariadb.openstack.org/v1beta1
5+
kind: Galera
6+
name: openstack
7+
commands:
8+
- script: |
9+
oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
10+
for i in `oc get pv | awk '/mysql-db.*galera/ {print $1}'`; do oc patch pv $i -p '{"spec":{"claimRef": null}}'; done

0 commit comments

Comments
 (0)