Skip to content

Change IPv6DualStack feature version check #1266

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jun 18, 2021
Merged

Change IPv6DualStack feature version check #1266

openshift-merge-robot merged 1 commit into from
Jun 18, 2021

Conversation

@ardaguclu
Copy link
Contributor

@ardaguclu ardaguclu commented Jun 18, 2021

This PR changes version extraction method for IPv6DualStack feature apply. In CI, OPENSHIFT_VERSION is always unset and for 4.6 and 4.7 versions, this condition is always false. Thereby, dualstack jobs are failing in these versions.

@openshift-ci openshift-ci bot requested review from markmc and zaneb June 18, 2021 06:22
@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-dualstack

@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-ipv6

hardys
hardys reviewed Jun 18, 2021
View reviewed changes
utils.sh
find assets/generated -name '*.yaml' -exec cp -f {} ${assets_dir}/openshift \;

if [[ "${IP_STACK}" == "v4v6" && "$OPENSHIFT_VERSION" =~ 4.[67] ]]; then
if [[ "${IP_STACK}" == "v4v6" && "$(openshift_version $OCP_DIR)" =~ 4.[67] ]]; then
Copy link

@hardys hardys Jun 18, 2021

Choose a reason for hiding this comment

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

Ah good catch, I wonder if we can either remove OPENSHIFT_VERSION, or make it local to the places it's really needed (only the oc download IIRC, everywhere else we should use the release-derived version since #1146)

Copy link
Contributor Author

@ardaguclu ardaguclu Jun 18, 2021

Choose a reason for hiding this comment

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

Thanks @hardys

I'll check the other places as well, if it does not need dramatic changes, I can add it to this PR.

Copy link
Contributor Author

@ardaguclu ardaguclu Jun 18, 2021

Choose a reason for hiding this comment

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

I removed OPENSHIFT_VERSION usage only

dev-scripts/common.sh

Line 93 in 82293c9

if [[ -z "$OPENSHIFT_VERSION" ]]; then
remained.

@hardys
Copy link

hardys commented Jun 18, 2021

/approve

@openshift-ci
Copy link

openshift-ci bot commented Jun 18, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hardys

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2021
@sadasu
Copy link
Contributor

sadasu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-dualstack

@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-ipv6

@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-dualstack

@zaneb
Copy link
Member

zaneb commented Jun 18, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 18, 2021
@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-ipv6

@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi

@openshift-ci
Copy link

openshift-ci bot commented Jun 18, 2021 •
edited
Loading

@ardaguclu: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-metal-ipi-ovn-dualstack fef649a link /test e2e-metal-ipi-ovn-dualstack

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@ardaguclu
Copy link
Contributor Author

ardaguclu commented Jun 18, 2021

/test e2e-metal-ipi-ovn-ipv6

@openshift-merge-robot openshift-merge-robot merged commit cae0ef7 into openshift-metal3:master Jun 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@markmc markmc Awaiting requested review from markmc

@zaneb zaneb Awaiting requested review from zaneb

1 more reviewer

@hardys hardys hardys left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@zaneb zaneb

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ardaguclu @hardys @sadasu @zaneb @openshift-merge-robot