Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ test: envtest
# - E2E_OPENSTACK_VERSION: if set, the known OpenStack versions range covering
# this version will be passed as a test run label `--test-run-labels min-version1=true,min-version2=true,max-version2=true,max-version3=true,`.
# See ./hack/e2e.sh . Test cases can be run/skipped with `testRunSelector` in `TestCase` based on it.
# - E2E_KUTTL_SKIP_ADMIN: if set to true, skip the tests that need admin
# credentials, for clouds where we don't have them.
.PHONY: test-e2e # Run the e2e tests against a Kind k8s instance that is spun up.
test-e2e: kuttl
# go test ./test/e2e/ -v -ginkgo.v
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -22,6 +23,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -22,6 +23,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -26,6 +27,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -48,6 +50,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -66,6 +69,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: {{ .PackageName }}-dependency
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -30,6 +31,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -23,6 +24,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -22,6 +23,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -22,6 +23,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -39,6 +41,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -25,6 +26,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -22,6 +23,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created or updated
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ metadata:
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
# An admin test also needs a 00-test-case.yaml, see https://k-orc.cloud/development/writing-tests/#admin-credentials
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
16 changes: 11 additions & 5 deletions hack/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ fi
# 2025.2 Flamingo
# 2025.1 Epoxy
KNOWN_RELEASES=("2025.1" "2025.2" "2026.1" "2026.2" "2027.1")
E2E_KUTTL_TEST_RUN_LABELS=
labels=
if [ -n "${E2E_OPENSTACK_VERSION:-}" ]; then
OS_RELEASE="$E2E_OPENSTACK_VERSION"
labels=

for release in "${KNOWN_RELEASES[@]}"; do
if [[ ! "$OS_RELEASE" < "$release" ]]; then
Expand All @@ -60,10 +59,17 @@ if [ -n "${E2E_OPENSTACK_VERSION:-}" ]; then
labels="${labels:+$labels,}max-${release}=true"
fi
done
fi

if [ -n "$labels" ]; then
E2E_KUTTL_TEST_RUN_LABELS="--test-run-labels $labels"
fi
# Skip the tests that need admin credentials (their TestCase selects on admin)
E2E_KUTTL_SKIP_ADMIN=${E2E_KUTTL_SKIP_ADMIN:-false}
if [ "$E2E_KUTTL_SKIP_ADMIN" = "true" ]; then
labels="${labels:+$labels,}admin=false"
fi

E2E_KUTTL_TEST_RUN_LABELS=
if [ -n "$labels" ]; then
E2E_KUTTL_TEST_RUN_LABELS="--test-run-labels $labels"
fi

# Export variables referenced in kuttl tests.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kuttl.dev/v1beta1
kind: TestCase
# This test needs admin credentials. Skipped by test runs labelled admin=false.
testRunSelector:
matchExpressions:
- key: admin
operator: NotIn
values: ["false"]
Loading
Loading