Skip to content

Modify CI scripts to use RHEL 8.6 repos#838

Closed
miabbott wants to merge 2 commits intoopenshift:masterfrom
miabbott:revert_kata_86_workaround
Closed

Modify CI scripts to use RHEL 8.6 repos#838
miabbott wants to merge 2 commits intoopenshift:masterfrom
miabbott:revert_kata_86_workaround

Conversation

@miabbott
Copy link
Copy Markdown
Member

@miabbott miabbott commented Jun 9, 2022

We've switched to using RHEL 8.6 in the manifest + downstream, so update the CI scripts accordingly.

We've switched to using RHEL 8.6, so this workaround is no longer
needed.

This reverts commit 68ec9f3.
@openshift-ci openshift-ci Bot requested review from gursewak1997 and ravanelli June 9, 2022 13:33
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2022
We've moved to using RHEL 8.6, so let's change CI accordingly.
@miabbott miabbott changed the title Revert "ci: fetch the 8.6 appstream repo for kata-containers" Modify CI scripts to use RHEL 8.6 repos Jun 9, 2022
Copy link
Copy Markdown
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

One idea, but LGTM as is too.

# we want to use RHEL 8.5 for testing until we can start using 8.6
# see https://github.com/openshift/release/pull/26193
curl -L http://base-"${ocpver_mut}"-rhel85.ocp.svc.cluster.local > src/config/ocp.repo
curl -L http://base-"${ocpver_mut}"-rhel86.ocp.svc.cluster.local > src/config/ocp.repo
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Idea: we can parse the RHEL version from automatic-version-prefix.

OK, this works:

rhelver=$(rpm-ostree compose tree --print-only manifest.yaml | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.)

With #803, it becomes a variable in the manifest so it's even more accessible. But sadly rpm-ostree doesn't reserialize variables, so we'd have to parse the YAML directly. We could change that though.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, miabbott

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

@travier
Copy link
Copy Markdown
Member

travier commented Jun 9, 2022

Merging this one as part of #839

@miabbott
Copy link
Copy Markdown
Member Author

miabbott commented Jun 9, 2022

/close

Preferring #839

@openshift-ci openshift-ci Bot closed this Jun 9, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 9, 2022

@miabbott: Closed this PR.

Details

In response to this:

/close

Preferring #839

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 9, 2022

@miabbott: all tests passed!

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.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants