Skip to content

Commit 837c5fe

Browse files
committed
feat(e2e): generate a larger set of namespaces during testing
1 parent 3e1ca71 commit 837c5fe

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ container:
9999
clean-e2e:
100100
kubectl delete crds --all
101101
kubectl delete apiservices.apiregistration.k8s.io v1alpha1.packages.apps.redhat.com || true
102+
for i in {1..40}; do kubectl delete namespace "ns-$i" || true; done
102103
kubectl delete -f test/e2e/resources/0000_50_olm_00-namespace.yaml
103104

104105
clean:

scripts/build_local.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
set -e
77

88
if [ -z "$NO_MINIKUBE" ]; then
9-
ps x | grep -q [m]inikube || minikube start --kubernetes-version="v1.11.0" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
9+
ps x | grep -q [m]inikube || minikube start --kubernetes-version="v1.12.0" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
1010
eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
1111
kubectl config use-context minikube
1212
fi
1313
docker build -f upstream.Dockerfile .
1414
docker tag $(docker images --filter 'label=stage=olm' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm:local
1515
docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm-e2e:local
16+
17+
for i in {1..40}
18+
do
19+
kubectl create namespace "ns-$i" || true
20+
done

test/e2e/operator_groups_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestOperatorGroup(t *testing.T) {
205205
return false, fetchErr
206206
}
207207
if len(fetched.Status.Namespaces) > 0 {
208-
require.ElementsMatch(t, expectedOperatorGroupStatus.Namespaces, fetched.Status.Namespaces)
208+
require.ElementsMatch(t, expectedOperatorGroupStatus.Namespaces, fetched.Status.Namespaces, "have %#v", fetched.Status.Namespaces)
209209
return true, nil
210210
}
211211
return false, nil

0 commit comments

Comments
 (0)