Skip to content

Ensure e2e tests use the correct versions yaml file#667

Merged
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
luksa:ginkgo-versions-yaml
Feb 19, 2025
Merged

Ensure e2e tests use the correct versions yaml file#667
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
luksa:ginkgo-versions-yaml

Conversation

@luksa
Copy link
Copy Markdown
Contributor

@luksa luksa commented Feb 19, 2025

We use -ldflags to set the istioversion.versionsFilename variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the versionsFilename is not set via ldflags, it will now use the environment variable VERSIONS_YAML_FILE. If this env var isn't set, we default to versions.yaml.

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 19, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.16%. Comparing base (e6c2390) to head (19d9ddf).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #667      +/-   ##
==========================================
- Coverage   74.57%   74.16%   -0.42%     
==========================================
  Files          42       43       +1     
  Lines        2584     2597      +13     
==========================================
- Hits         1927     1926       -1     
- Misses        565      577      +12     
- Partials       92       94       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

return list, defaultVersion, oldVersion, newVersion, versionMap, aliasList
}

func getEnvVar(key string, defaultValue string) string {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There is already an env.Get defined in the e2e util package:

func Get(key, defaultValue string) string {
value := os.Getenv(key)

Maybe worth moving it to a common place and used it both in the version.go and in the e2e test. wdyt?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, you're absolutely right.

I've moved it to pkg/env, but I had to remove the ginkgo logging. I hated that thing anyway, because it got printed even when the tests weren't running in verbose mode. If we need those lines, we should move print them somewhere else.

Copy link
Copy Markdown
Contributor

@fjglira fjglira left a comment

Choose a reason for hiding this comment

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

Just a minor comment

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
@luksa luksa force-pushed the ginkgo-versions-yaml branch from 0163196 to 19d9ddf Compare February 19, 2025 14:09
@istio-testing istio-testing merged commit 148eb64 into istio-ecosystem:main Feb 19, 2025
@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #667 failed to apply on top of branch "release-1.0":

Applying: Ensure e2e tests use the correct versions yaml file
Using index info to reconstruct a base tree...
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/controlplane/control_plane_suite_test.go
M	tests/e2e/dualstack/dualstack_suite_test.go
M	tests/e2e/multicluster/multicluster_suite_test.go
A	tests/e2e/multicontrolplane/multi_control_plane_suite_test.go
M	tests/e2e/operator/operator_suite_test.go
M	tests/e2e/util/common/e2e_utils.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/util/common/e2e_utils.go
Auto-merging tests/e2e/operator/operator_suite_test.go
CONFLICT (modify/delete): tests/e2e/multicontrolplane/multi_control_plane_suite_test.go deleted in HEAD and modified in Ensure e2e tests use the correct versions yaml file. Version Ensure e2e tests use the correct versions yaml file of tests/e2e/multicontrolplane/multi_control_plane_suite_test.go left in tree.
Auto-merging tests/e2e/multicluster/multicluster_suite_test.go
Auto-merging tests/e2e/dualstack/dualstack_suite_test.go
Auto-merging tests/e2e/controlplane/control_plane_suite_test.go
Auto-merging tests/e2e/ambient/ambient_suite_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Ensure e2e tests use the correct versions yaml file

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #668

luksa added a commit to luksa/sail-operator that referenced this pull request Feb 19, 2025
)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>

(cherry picked from commit 148eb64)
Signed-off-by: Marko Lukša <mluksa@redhat.com>
istio-testing pushed a commit that referenced this pull request Feb 19, 2025
We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.



(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
luksa added a commit to luksa/sail-operator that referenced this pull request Feb 19, 2025
) (istio-ecosystem#669)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
openshift-merge-bot bot referenced this pull request in openshift-service-mesh/sail-operator Feb 19, 2025
We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Feb 24, 2025
)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Feb 24, 2025
* upstream/release-1.0:
  Make environment variable consistent (openshift-service-mesh#664)
  Add multi control plane e2e tests (openshift-service-mesh#610) (openshift-service-mesh#670)
  Ensure e2e tests use the correct versions yaml file (openshift-service-mesh#667) (openshift-service-mesh#669)
  Add version alias support  (openshift-service-mesh#566) (openshift-service-mesh#662)
  Add missing link for: Example using the RevisionBased strategy and an IstioRevisionTag

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Feb 24, 2025
)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Feb 24, 2025
Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>
FilipB added a commit to FilipB/sail-operator that referenced this pull request Feb 24, 2025
* upstream-eco/main:
  Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)
  Make environment  variable consistent (istio-ecosystem#663)
  Add contributor meeting information to the contributor.md file (istio-ecosystem#623)
  Add version alias support  (istio-ecosystem#566)
fjglira added a commit to fjglira/sail-operator that referenced this pull request Feb 27, 2025
Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>
istio-testing pushed a commit that referenced this pull request Feb 27, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Mar 3, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Mar 3, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Mar 4, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Mar 4, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
fjglira added a commit to fjglira/sail-operator that referenced this pull request Mar 4, 2025
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
@luksa luksa deleted the ginkgo-versions-yaml branch April 4, 2025 07:03
yannuil pushed a commit to yannuil/sail-operator that referenced this pull request Jun 20, 2025
) (istio-ecosystem#669) (istio-ecosystem#254)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Feb 9, 2026
istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
dgn pushed a commit to dgn/sail-operator that referenced this pull request Mar 17, 2026
)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
dgn pushed a commit to dgn/sail-operator that referenced this pull request Mar 17, 2026
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
FilipB added a commit to FilipB/sail-operator that referenced this pull request Mar 18, 2026
istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
FilipB added a commit to FilipB/sail-operator that referenced this pull request Mar 18, 2026
istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
mkralik3 pushed a commit to mkralik3/sail-operator that referenced this pull request Mar 20, 2026
… (istio-ecosystem#730)

istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
mkralik3 pushed a commit to mkralik3/sail-operator that referenced this pull request Mar 23, 2026
… (istio-ecosystem#731)

istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants