-
Notifications
You must be signed in to change notification settings - Fork 90
Fix upgrade tests for release-5.0 #664
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
Fix upgrade tests for release-5.0 #664
Conversation
# Set this to 4.7 because we need to calculate the latest previous | ||
# version prior to 5.0, which is 4.6 for OpenShift Logging. | ||
major_version=4 | ||
minor_version=7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
previous version should be 4.7 or 4.6?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previous to 5.0 is 4.6, but in order to calculate that via get_latests_previous_version
in need to fake 5.0 as 4.7. The whole block should be removed in master.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think the fix should instead happen in the "get_latest_previous_version"
this feels like a hacky way to resolve this...
it also means that we are dependent on the 4.7 manifest being in our branch for this to work...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No we are not dependent to 4.7 manifest. We only pretend 5.0 to be 4.7 for the sake of this bash sourcery. The version 4.7 is used for calculation of 4.6 to create Subscription using operatorhub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/retest |
2 similar comments
/retest |
/retest |
4d9a14d
to
45cbc4a
Compare
/retest |
/lgtm |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcantrill, periklis, vimalk78 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
minor_version=7 | ||
fi | ||
|
||
export version="$(echo $major_version.$minor_version)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see the export above the if block, but it serves the same purpose as it would if we exported it here after the if block
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No it is not! The export version
should be set to 5.0
so that the upgrade bash sourcery can patch the subscription. However get_latest_previous_version
needs the value 4.7
to calculate 4.6 as the previous version and in turn create the initial subscription.
/hold |
/hold cancel |
/hold @periklis can you please address my questions comments? |
Addressed them! PTAL |
/hold cancel |
Description
This PR provides a minor fix for the elasticsearch-operator E2E upgrade suite. The suite was broken by changing the release schema from OCP to OpenShift Logging, i.e. switching from 4.6 to 5.x
/cc @vimalk78
/assign @jcantrill
Links