Improve CloudStack E2E template selection logic #5923
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eks-distro-bot
added
the
size/L
panktishah26
force-pushed
the
cloudstack-template-e2e
branch
from
a736796
to
822bf6e
Compare
Codecov Report
@@ Coverage Diff @@
## main #5923 +/- ##
==========================================
+ Coverage 73.63% 73.64% +0.01%
==========================================
Files 452 452
Lines 37992 38016 +24
==========================================
+ Hits 27974 27998 +24
+ Misses 8395 8394 -1
- Partials 1623 1624 +1
|
g-gaston
reviewed
May 25, 2023
panktishah26
force-pushed
the
cloudstack-template-e2e
branch
2 times, most recently
from
3c08a3d
to
4f1c7c1
Compare
|
/test eks-anywhere-presubmit |
g-gaston
approved these changes
May 31, 2023
Refactor vSphere and CloudStack template name code to fit for all the providers
panktishah26
force-pushed
the
cloudstack-template-e2e
branch
from
4f1c7c1
to
2c9c7d8
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: 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 |
ddjjia
pushed a commit
to ddjjia/eks-anywhere
that referenced
this pull request
Jun 8, 2023
Refactor vSphere and CloudStack template name code to fit for all the providers
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
For CloudStack e2e tests we get the template names from the secret value. When we change eks-d version, template names get out of sync which makes e2e test failure until we change the template name in the secret.
To avoid this, this PR includes a logic to select the right template from the test runner itself and by not depending on the secret value. It looks for template name in below order,
Look for explicit configuration through an env var: "T_CLOUDSTACK_TEMPLATE_{osFamily}_{eks-d version}" eg. T_CLOUDSTACK_TEMPLATE_REDHAT_KUBERNETES_1_23_EKS_22. This should be used for explicit configuration, mostly in local development for overrides.
If not present, look for a template if the default templates: "{eks-d version}-{osFamily}" eg. kubernetes-1-23-eks-22-redhat. This is what should be used most of the time in CI, the explicit configuration is not present but the right template has already been imported to cloudstack.
If the template doesn't exist, default to the value of the default template env vars: eg. "T_CLOUDSTACK_TEMPLATE_REDHAT_1_23". This is a catch all condition. Mostly for edge cases where the bundle has been updated with a new eks-d version, but the the new template hasn't been imported yet. It also preserves backwards compatibility.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.