Skip to content
Draft
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
null
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ e2e-non-olm-tests-all:
build: generate fmt vet ## Build manager binary.
go build -o bin/manager ./cmd/main.go

.PHONY: gitops-operator-tests-ext
gitops-operator-tests-ext: ## Build OpenShift Tests Extension binary for parallel E2E tests.
GO_COMPLIANCE_POLICY="exempt_all" go build -C cmd/gitops-operator-tests-ext -o ../../bin/gitops-operator-tests-ext .

.PHONY: run
run: manifests generate fmt vet ## Run a controller from your host.
CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES=argo-rollouts,test-rom-ns-1,rom-ns-1,openshift-gitops ARGOCD_CLUSTER_CONFIG_NAMESPACES="openshift-gitops, argocd-e2e-cluster-config, argocd-test-impersonation-1-046, argocd-agent-principal-1-051, argocd-agent-agent-1-052, appset-argocd, appset-old-ns, appset-new-ns, ns-hosting-principal, ns-hosting-managed-agent, ns-hosting-autonomous-agent" REDIS_CONFIG_PATH="build/redis" go run ./cmd/main.go
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[
{
"name": "GitOps Operator Parallel E2E Tests 1-086_validate_applicationset_extra_command_args validates that extra command arguments are added to the ApplicationSet controller deployment",
"labels": {},
"resources": {
"isolation": {}
},
"source": "openshift:payload:gitops-operator",
"codeLocations": [
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-086_validate_applicationset_extra_command_args.go:20",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-086_validate_applicationset_extra_command_args.go:22",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-086_validate_applicationset_extra_command_args.go:32",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-086_validate_applicationset_extra_command_args.go:38",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-086_validate_applicationset_extra_command_args.go:43"
],
"lifecycle": "blocking",
"environmentSelector": {}
},
{
"name": "GitOps Operator Parallel E2E Tests 1-098_validate_dex_clientsecret_deprecated validates that dex client secret is properly copied from service account token to argocd-secret",
"labels": {},
"resources": {
"isolation": {}
},
"source": "openshift:payload:gitops-operator",
"codeLocations": [
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go:36",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go:38",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go:45",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go:52"
],
"lifecycle": "blocking",
"environmentSelector": {}
},
{
"name": "GitOps Operator Parallel E2E Tests 1-121_validate_custom_labels_rollouts ensures that custom labels set by the operator are added to Argo Rollouts resources",
"labels": {},
"resources": {
"isolation": {}
},
"source": "openshift:payload:gitops-operator",
"codeLocations": [
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go:34",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go:36",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go:43",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go:49"
],
"lifecycle": "blocking",
"environmentSelector": {}
},
{
"name": "GitOps Operator Parallel E2E Tests 1-122_validate_user_defined_appproject verifies creating and configuring a user-defined AppProject instance with target namespaces and Application CR referencing it",
"labels": {},
"resources": {
"isolation": {}
},
"source": "openshift:payload:gitops-operator",
"codeLocations": [
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go:38",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go:40",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go:50",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go:57",
"/home/dfrazzet/github/gitops-operator/test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go:73"
],
"lifecycle": "blocking",
"environmentSelector": {}
}
]
51 changes: 51 additions & 0 deletions cmd/gitops-operator-tests-ext/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# gitops-operator-tests-ext

OpenShift Tests Extension (OTE) binary for GitOps Operator parallel E2E tests.

It registers tests from `test/openshift/e2e/ginkgo/parallel` and exposes the standard OTE commands (`list`, `run-test`, `run-suite`, `update`, etc.). This mirrors the parallel portion of the CI [`gitops-operator-tests`](https://github.com/openshift/release/tree/main/ci-operator/step-registry/gitops-operator/tests) step.

## Build

From the repository root:

```bash
make gitops-operator-tests-ext
```

Or from this directory:

```bash
GO_COMPLIANCE_POLICY=exempt_all go build -o gitops-operator-tests-ext .
```

The binary is written to `bin/gitops-operator-tests-ext` when built via `make`.

For local development against an unpublished extension, add a replace before building:

```bash
go mod edit -replace github.com/openshift-eng/openshift-tests-extension=/path/to/openshift-tests-extension
```

## Prerequisites

- Logged-in `oc` access to a cluster
- `openshift-gitops-operator` installed
- Cluster prep from `scripts/openshift-CI-kuttl-tests.sh` (creates `test-argocd` and waits for Argo CD pods)

## Usage

```bash
./gitops-operator-tests-ext info
./gitops-operator-tests-ext list

./gitops-operator-tests-ext run-suite openshift/gitops-operator/parallel \
--junit-path /tmp/openshift-gitops-parallel-e2e.xml

./gitops-operator-tests-ext run-test '<test name from list>'
```

After adding or renaming tests, refresh metadata from the repository root:

```bash
./gitops-operator-tests-ext update
```
186 changes: 186 additions & 0 deletions cmd/gitops-operator-tests-ext/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
module github.com/redhat-developer/gitops-operator/cmd/gitops-operator-tests-ext

go 1.25.9

require (
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260528165303-ac98bf018579
github.com/redhat-developer/gitops-operator v0.0.0
github.com/spf13/cobra v1.10.2
)

require (
cel.dev/expr v0.25.1 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cyphar.com/go-pathrs v0.2.1 // indirect
dario.cat/mergo v1.0.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.6 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 // indirect
github.com/argoproj-labs/argocd-image-updater v1.1.2 // indirect
github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530 // indirect
github.com/argoproj/argo-cd/v3 v3.3.10 // indirect
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d // indirect
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
github.com/argoproj/pkg/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 // indirect
github.com/casbin/casbin/v2 v2.135.0 // indirect
github.com/casbin/govaluate v1.10.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/chainguard-dev/git-urls v1.0.2 // indirect
github.com/cloudflare/circl v1.6.3 // indirect
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dlclark/regexp2 v1.11.5 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.5 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.22.1 // indirect
github.com/go-openapi/jsonreference v0.21.3 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
github.com/go-redis/cache/v9 v9.0.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-github/v69 v69.2.0 // indirect
github.com/google/go-github/v75 v75.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jonboulle/clockwork v0.5.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.5.1 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/ginkgo/v2 v2.28.1 // indirect
github.com/onsi/gomega v1.39.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa // indirect
github.com/operator-framework/api v0.17.5 // indirect
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/redis/go-redis/v9 v9.8.0 // indirect
github.com/robfig/cron/v3 v3.0.2-0.20210106135023-bc59245fe10e // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.41.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.34.1 // indirect
k8s.io/apiextensions-apiserver v0.34.1 // indirect
k8s.io/apimachinery v0.34.1 // indirect
k8s.io/apiserver v0.34.1 // indirect
k8s.io/cli-runtime v0.34.0 // indirect
k8s.io/client-go v0.34.1 // indirect
k8s.io/component-base v0.34.1 // indirect
k8s.io/component-helpers v0.34.0 // indirect
k8s.io/controller-manager v0.34.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-aggregator v0.34.0 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/kubectl v0.34.0 // indirect
k8s.io/kubernetes v1.34.2 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/controller-runtime v0.22.3 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.21.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1-0.20251003215857-446d8398e19c // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
github.com/redhat-developer/gitops-operator => ../..
)
Loading