Skip to content

[release-1.0] Ensure e2e tests use the correct versions yaml file (#667)#669

Merged
istio-testing merged 1 commit intoistio-ecosystem:release-1.0from
luksa:cherry-pick
Feb 19, 2025
Merged

[release-1.0] Ensure e2e tests use the correct versions yaml file (#667)#669
istio-testing merged 1 commit intoistio-ecosystem:release-1.0from
luksa:cherry-pick

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.

(cherry picked from commit 148eb64)
Fixes: #668

)

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>
@luksa luksa requested a review from a team as a code owner February 19, 2025 14:45
@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.27%. Comparing base (a246427) to head (857e0b5).
Report is 1 commits behind head on release-1.0.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-1.0     #669      +/-   ##
===============================================
- Coverage        74.57%   74.27%   -0.30%     
===============================================
  Files               42       43       +1     
  Lines             2584     2597      +13     
===============================================
+ Hits              1927     1929       +2     
- Misses             565      575      +10     
- Partials            92       93       +1     

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

@luksa
Copy link
Copy Markdown
Contributor Author

luksa commented Feb 19, 2025

/retest

@istio-testing istio-testing merged commit 7f127e0 into istio-ecosystem:release-1.0 Feb 19, 2025
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>
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
@luksa luksa deleted the cherry-pick 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>
mkralik3 pushed a commit to mkralik3/sail-operator that referenced this pull request Mar 23, 2026
Co-authored-by: openshift-service-mesh-bot <null>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants