Skip to content

Add a UPI based src template. #5388

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

Merged

Conversation

markusthoemmes
Copy link
Contributor

The UPI E2E template is focused on running origin e2e tests and nothing else.

This is mostly a copy of the UPI E2E template, mostly copying over the test part of the src template and adjusting the top level parameters accordingly.

/assign @wking @jstuever

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 11, 2019
}
EOF
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
Copy link
Contributor

Choose a reason for hiding this comment

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

@markusthoemmes apiVersion should be v1. I need to change that in the other template as well.

@jstuever
Copy link
Contributor

Defer to Trevor.
/unassign @jstuever

@wking
Copy link
Member

wking commented Oct 11, 2019

This is mostly a copy of the UPI E2E template, mostly copying over the test part of the src template...

This makes sense to me. But to try to keep the templates as close as possible, can we make this a series of pivots instead of one commit? For example, I don't understand what IMAGE_FORMAT is about. Seems to have something to do with logging (e.g. #4788), but it's not obvious to me why you'd need it in cluster-launch-installer-upi-src.yaml but not in cluster-launch-installer-upi-e2e.yaml. Same thing for your setup-google-cloud-sdk addition; seems like that should go in both UPI templates. And the Azure / OpenStack "${CLUSTER_TYPE}" switches too.

@markusthoemmes
Copy link
Contributor Author

@wking that does make sense to me. I'll see if I can make this easier on the reviewers and I agree that some of these bits look like they should be in the e2e manifest anyway.

The UPI E2E template is focused on running origin e2e tests and nothing else.
@markusthoemmes
Copy link
Contributor Author

Updated the template to pick up my latest commit on master. The diff between e2e and src template is now this:

12c12
< - name: IMAGE_TESTS
---
> - name: LOCAL_IMAGE_SRC
218c218
<       image: ${IMAGE_TESTS}
---
>       image: ${LOCAL_IMAGE_SRC}
257c257
<         export PATH=/usr/libexec/origin:$PATH
---
>         export PATH=/tmp/shared:$PATH
325,339d324
<         mkdir -p /tmp/output
<         cd /tmp/output
< 
<         function run-upgrade-tests() {
<           openshift-tests run-upgrade "${TEST_SUITE}" --to-image "${RELEASE_IMAGE_LATEST}" \
<             --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
<           return 0
<         }
< 
<         function run-tests() {
<           openshift-tests run "${TEST_SUITE}" \
<             --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
<           return 0
<         }
< 

@wking
Copy link
Member

wking commented Oct 15, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markusthoemmes, wking

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 15, 2019
@openshift-merge-robot openshift-merge-robot merged commit 7faafd2 into openshift:master Oct 15, 2019
markusthoemmes added a commit to markusthoemmes/openshift-ci-tools that referenced this pull request Oct 16, 2019
wking added a commit to wking/openshift-release that referenced this pull request Dec 5, 2019
…i-src: Drop unused template

The template was added in 78d8c17 (Add a UPI based src template,
2019-10-11, openshift#5388), but had no consumers.  There were potential
consumers in flight with [1,2], but both of those pull requests closed
without landing.  We can always dig this back out of the Git history
if it turns out folks actually do need a non-e2e UPI template, but
until then remove it to save the maintenance cost of keeping unused
code up to date.

[1]: https://github.com/openshift/release/pull/4325/files#diff-264b567e579413709feec76ef0604cf3R336
[2]: https://github.com/openshift/release/pull/5367/files#diff-131c135812b5130dcd1252473291b4a5R188
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants