Skip to content

Commit 7613b72

Browse files
committed
Remove flakey tests
These tests are flaky or unused. Removing them from testing pipelines. We need to refactor them so that they run more consistently
1 parent 1a009c2 commit 7613b72

File tree

133 files changed

+6
-3135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+6
-3135
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ clean: clean-deprecated
5858
rm -f bin/postgres-operator
5959
rm -rf licenses/*/
6060
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
61-
[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
6261
[ ! -f hack/tools/setup-envtest ] || rm hack/tools/setup-envtest
6362
[ ! -d hack/tools/envtest ] || { chmod -R u+w hack/tools/envtest && rm -r hack/tools/envtest; }
6463
[ ! -d hack/tools/pgmonitor ] || rm -rf hack/tools/pgmonitor
@@ -85,6 +84,8 @@ clean-deprecated: ## Clean deprecated resources
8584
[ ! -d build/crunchy-postgres-exporter ] || rm -r build/crunchy-postgres-exporter
8685
@# CRDs used to require patching
8786
[ ! -d build/crd ] || rm -r build/crd
87+
@# Old testing directories
88+
[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
8889

8990

9091
##@ Deployment
@@ -228,7 +229,6 @@ generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/c
228229
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
229230
generate-kuttl: ## Generate kuttl tests
230231
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
231-
[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
232232
bash -ceu ' \
233233
case $(KUTTL_PG_VERSION) in \
234234
16 ) export KUTTL_BITNAMI_IMAGE_TAG=16.0.0-debian-11-r3 ;; \
@@ -245,7 +245,7 @@ generate-kuttl: ## Generate kuttl tests
245245
source="$${1}" target="$${1/e2e/e2e-generated}"; \
246246
mkdir -p "$${target%/*}"; render < "$${source}" > "$${target}"; \
247247
shift; \
248-
done' - testing/kuttl/e2e/*/*.yaml testing/kuttl/e2e-other/*/*.yaml testing/kuttl/e2e/*/*/*.yaml testing/kuttl/e2e-other/*/*/*.yaml
248+
done' - testing/kuttl/e2e/*/*.yaml testing/kuttl/e2e/*/*/*.yaml
249249

250250
##@ Generate
251251

testing/kuttl/README.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,10 @@ calling the `make generate-kuttl` target:
7474
KUTTL_PG_VERSION=13 KUTTL_POSTGIS_VERSION=3.0 make generate-kuttl
7575
```
7676

77-
This will loop through the files under the `e2e` and `e2e-other` directories and create matching
78-
files under the `e2e-generated` and `e2e-generated-other` directories that can be checked for
77+
This will loop through the files under testing directories and create matching
78+
files under testing + `generated` directories that can be checked for
7979
correctness before running the tests.
8080

81-
Please note, `make check-kuttl` does not run the `e2e-other` tests. To run the `postgis-cluster`
82-
test, you can use:
83-
84-
```
85-
kubectl kuttl test testing/kuttl/e2e-generated-other/ --timeout=180 --test postgis-cluster`
86-
```
87-
88-
To run the `gssapi` test, please see testing/kuttl/e2e-other/gssapi/README.md.
89-
9081
To prevent errors, we want to set defaults for all the environment variables used in the source
9182
YAML files; so if you add a new test with a new variable, please update the Makefile with a
9283
reasonable/preferred default.

testing/kuttl/e2e-other/autogrow-volume/00-assert.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/01-create.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/02-add-data.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/03-assert.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/04-assert.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/05-check-event.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

testing/kuttl/e2e-other/autogrow-volume/files/01-cluster-and-pvc-created.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)