Skip to content

Conversation

jgwest
Copy link
Member

@jgwest jgwest commented Aug 5, 2025

What type of PR is this?
/kind enhancement

What does this PR do / why we need it:

  • Carefully ports all existing kuttl tests to ginkgo
  • Unifies the test number/naming scheme with gitops-operator repository, since many tests are shared between the two
  • Disables kuttl tests from the project, and switches to ginkgo for PR
  • For tests that require OpenShift, if the cluster is not OpenShift, the test will be skipped
  • Add documentation for running the tests
  • Port is up to date with kuttl tests as of Aug 11, 2025.
  • Added back the replace ( ... ) block in go.mod (it's from Argo CD go.mod) due to error on go mod tidy (see review comment)

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

)

require (
cloud.google.com/go/compute/metadata v0.6.0 // indirect
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Added back the replace ( ... ) block from Argo CD due to this error on go mod tidy:
[jgw@localhost-lan argocd-operator]$ go mod tidy
go: downloading github.com/onsi/ginkgo/v2 v2.22.0
go: downloading cloud.google.com/go/compute v1.23.3
go: downloading github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153
go: downloading github.com/rogpeppe/go-internal v1.13.1
go: downloading github.com/golang/mock v1.2.0
go: downloading github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db
go: downloading cloud.google.com/go v0.38.0
go: github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/application imports
	github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1 imports
	github.com/argoproj/argo-cd/v3/util/git imports
	golang.org/x/oauth2/google imports
	cloud.google.com/go/compute/metadata: ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
	cloud.google.com/go v0.38.0 (/home/jgw/go/pkg/mod/cloud.google.com/go@v0.38.0/compute/metadata)
	cloud.google.com/go/compute/metadata v0.6.0 (/home/jgw/go/pkg/mod/cloud.google.com/go/compute/metadata@v0.6.0)

@jgwest jgwest force-pushed the port-to-ginkgo-july-2025 branch 4 times, most recently from 34e1d8d to c3236fb Compare August 11, 2025 20:05
Copy link
Contributor

@aali309 aali309 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jgwest jgwest force-pushed the port-to-ginkgo-july-2025 branch from c3236fb to ff31e38 Compare August 12, 2025 20:22
Signed-off-by: Jonathan West <jonwest@redhat.com>
@jgwest jgwest force-pushed the port-to-ginkgo-july-2025 branch from ff31e38 to 61378d0 Compare August 13, 2025 03:38

# go-get-tool will 'go install' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
define go-get-tool
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest extracting the shell portion of this size and complexity into an independent /hack/ script. Enables proper formatting, IDE syntax highlight, use static analysis, bash strict mode usage, etc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants