Skip to content

Commit b517855

Browse files
jgwestjgwest
authored
chore: remove deprecrated kuttl from repo (#1134)
Signed-off-by: Jonathan West <jgwest@gmail.com>
1 parent 09e251f commit b517855

956 files changed

Lines changed: 18 additions & 21608 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -152,44 +152,25 @@ test: manifests generate fmt vet ## Run unit tests.
152152

153153

154154
.PHONY: e2e-tests-ginkgo
155-
e2e-tests-ginkgo: e2e-tests-sequential-ginkgo e2e-tests-parallel-ginkgo ## Runs kuttl e2e sequential and parallel tests
155+
e2e-tests-ginkgo: e2e-tests-sequential-ginkgo e2e-tests-parallel-ginkgo ## Runs Ginkgo e2e sequential and parallel tests
156156

157157
.PHONY: e2e-tests-sequential-ginkgo
158-
e2e-tests-sequential-ginkgo: ginkgo ## Runs kuttl e2e sequential tests
158+
e2e-tests-sequential-ginkgo: ginkgo ## Runs Ginkgo e2e sequential tests
159159
@echo "Running GitOps Operator sequential Ginkgo E2E tests..."
160160
$(GINKGO_CLI) -v --trace --timeout 240m -r ./test/openshift/e2e/ginkgo/sequential
161161

162-
.PHONY: e2e-tests-parallel-ginkgo ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time)
162+
.PHONY: e2e-tests-parallel-ginkgo ## Runs Ginkgo e2e parallel tests, (Defaults to 5 runs at a time)
163163
e2e-tests-parallel-ginkgo: ginkgo
164164
@echo "Running GitOps Operator parallel Ginkgo E2E tests..."
165165
$(GINKGO_CLI) -p -v -procs=5 --trace --timeout 60m -r ./test/openshift/e2e/ginkgo/parallel
166166

167167
.PHONY: e2e-tests-sequential
168168
e2e-tests-sequential:
169-
CI=prow make e2e-tests-sequential-ginkgo ## Runs kuttl e2e sequentail tests
170-
# @echo "Running GitOps Operator sequential E2E tests..."
171-
# . ./scripts/run-kuttl-tests.sh sequential
169+
CI=prow make e2e-tests-sequential-ginkgo ## Runs Ginkgo e2e sequential tests
172170

173-
.PHONY: e2e-tests-parallel ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time)
171+
.PHONY: e2e-tests-parallel ## Runs Ginkgo e2e parallel tests, (Defaults to 5 runs at a time)
174172
e2e-tests-parallel:
175173
CI=prow make e2e-tests-parallel-ginkgo
176-
# @echo "Running GitOps Operator parallel E2E tests..."
177-
# . ./scripts/run-kuttl-tests.sh parallel
178-
179-
.PHONY: e2e-non-olm-tests-sequential
180-
e2e-non-olm-tests-sequential: ## Runs kuttl non-olm e2e sequentail tests
181-
@echo "Running Non-OLM GitOps Operator sequential E2E tests..."
182-
. ./hack/scripts/run-non-olm-kuttl-test.sh -t sequential
183-
184-
.PHONY: e2e-non-olm-tests-parallel ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
185-
e2e-non-olm-tests-parallel:
186-
@echo "Running Non-OLM GitOps Operator parallel E2E tests..."
187-
. ./hack/scripts/run-non-olm-kuttl-test.sh -t parallel
188-
189-
.PHONY: e2e-non-olm-tests-all ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time)
190-
e2e-non-olm-tests-all:
191-
@echo "Running Non-OLM GitOps Operator E2E tests..."
192-
. ./hack/scripts/run-non-olm-kuttl-test.sh -t all
193174

194175
##@ Build
195176

‎hack/scripts/README.md‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
### Non OLM based operator e2e kuttl test
1+
### Non-OLM operator: Ginkgo E2E tests
22

3-
`run-non-olm-kuttl-test.sh` is a bash script utility, that can be used to run the end to end test for Openshift GitOps Operator without using the `Operator Lifecycle Manager (OLM)`.
3+
When the operator is installed without OLM (for example via a plain `Deployment` in `openshift-gitops-operator`), run the OpenShift E2E suite with `NON_OLM=true` so tests that require a `Subscription` or productized images are skipped.
44

5-
### Usage
5+
From the repository root:
66

7-
The `run-non-olm-kuttl-test.sh` script needs to be run with argument specifying the test suite to be run with .
7+
```bash
8+
NON_OLM=true make e2e-tests-sequential-ginkgo
9+
# and/or
10+
NON_OLM=true make e2e-tests-parallel-ginkgo
11+
```
812

9-
run-non-olm-kuttl-test.sh [ -t sequential|parallel|all ]
10-
11-
Example
12-
13-
`./run-non-olm-kuttl-test.sh -t parallel` will run the entire parallel test suite. By default it will run all the tests.
14-
15-
The directories that are not needed for the nightly operator are excluded before running the tests.
16-
If you want to add more excluded tests, you can do so by using an environment variable called `EXCLUDED_TESTS` like so,
17-
18-
`export EXCLUDED_TESTS="1-031_validate_toolchain 1-085_validate_dynamic_plugin_installation 1-038_validate_productized_images"`
13+
See `test/openshift/e2e/README.md` for full options (`LOCAL_RUN`, `SKIP_HA_TESTS`, and so on).

‎hack/scripts/run-non-olm-kuttl-test.sh‎

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

‎openshift-ci/build-root/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@
33
FROM quay.io/devtools_gitops/go-toolset:1.25.5
44
USER root
55

6-
ARG KUBECTL_KUTTL_VERSION=0.12.1
76
ARG OPERATOR_SDK_VERSION=1.35.0
87

98
# Install kubectl tool which is used in e2e-tests
109
RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
1110
chmod +x /usr/local/bin/kubectl
1211

13-
# Install kubectl-kuttl tool which is used in e2e-tests
14-
RUN curl -sSL -o /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v${KUBECTL_KUTTL_VERSION}/kubectl-kuttl_${KUBECTL_KUTTL_VERSION}_linux_x86_64 && \
15-
chmod +x /usr/local/bin/kubectl-kuttl
16-
1712
# Install argocd cli tool which is used in e2e-tests
1813
RUN curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 && \
1914
chmod +x /usr/local/bin/argocd

‎scripts/openshiftci-olm-kuttl-tests.sh‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ if [ "$E2E_SKIP_OPERATOR_INSTALLATION" = false ]; then
8383
install_operator_resources
8484
fi
8585

86-
header "Running kuttl e2e tests"
86+
header "Running Ginkgo e2e tests"
8787
make e2e-tests-sequential || failed=1
8888

8989
if [[ "$IGNORE_PARALLEL_TESTS" = "false" ]]; then

‎scripts/run-kuttl-tests.sh‎

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

‎test/examples/Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This directory contains examples for testing gitops operator.
44

5-
We used to use some of our personal github profiles in Kuttl testing repository as a repoURL. We decided to centralized location for storing them in gitops-operator repo and eliminate the dependency of personal account of a developer or QE.
5+
We used to use some of our personal GitHub profiles in older E2E fixtures as a `repoURL`. We centralized these examples in the gitops-operator repo to avoid depending on a developer or QE personal account.
66

77
## How these examples are used?
88

‎test/openshift/e2e/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You can skip non-local-supported tests by setting `LOCAL_RUN=true`:
6262
```bash
6363
LOCAL_RUN=true make e2e-tests-sequential-ginkgo
6464
# and/or
65-
LOCAL_RUN=true make e2e-tests-sequential-parallel
65+
LOCAL_RUN=true make e2e-tests-parallel-ginkgo
6666
```
6767

6868

@@ -224,7 +224,7 @@ defer cleanupFunc()
224224
### `01-create-or-update-resource.yaml`
225225

226226
Example:
227-
In kuttl, this would create (or modify an existing) `ArgoCD` CR to have dex sso provider using openShiftOAuth.
227+
In a Kuttl test, this would create (or modify an existing) `ArgoCD` CR to use the Dex SSO provider with `openShiftOAuth`.
228228
```yaml
229229
apiVersion: argoproj.io/v1alpha1
230230
kind: ArgoCD

‎test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-assert.yaml‎

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

‎test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-check-console-link.yaml‎

Whitespace-only changes.

0 commit comments

Comments
 (0)