Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSSM-8242: use just one istio version so we can build it in cpaas + bump to tp2 #146

Merged

Conversation

FilipB
Copy link

@FilipB FilipB commented Oct 10, 2024

  • use ossm/versions.yaml with only one version so we can build in cpaas
  • bump version to tp2

To be still testing more istio versions from ./vesions.yaml, there are following changes in OpenShift CI jobs.

OPERATOR_NAME = servicemeshoperator3
HUB = quay.io/maistra-dev
CHANNELS = candidates
HELM_VALUES_FILE = ossm/values.yaml
VERSIONS_YAML_FILE = versions.yaml
VERSIONS_YAML_FILE ?= ossm/versions.yaml

Choose a reason for hiding this comment

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

The whole purpose of this variable is to make it possible to use another versions file without changing the Makefile. Just set export VERSIONS_YAML_FILE=ossm/versions.yaml before invoking make and you're all set.

Copy link

Choose a reason for hiding this comment

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

yes but this vendor definition is applied before we do the ?= in the core Makefile so this change is correct - otherwise it wouldn't be possible to overwrite in env var anymore (which @FilipB is doing in his other PR)

Copy link
Author

@FilipB FilipB Oct 10, 2024

Choose a reason for hiding this comment

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

This is a change in default behavior. Now make gen will use ossm/versions.yaml. So to run e2e tests against all versions in ./versions.yaml, we will have to do: 1) VERSIONS_YAML_FILE="versions.yaml" make gen, 2) make test.e2e.ocp

@openshift-merge-bot openshift-merge-bot bot merged commit c8c95fc into openshift-service-mesh:main Oct 10, 2024
10 checks passed
@nrfox nrfox mentioned this pull request Oct 11, 2024
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.

3 participants