Skip to content

CI: Partially enable RHCOS 9 & SCOS testing#937

Merged
openshift-ci[bot] merged 3 commits intoopenshift:masterfrom
travier:scos-ci3
Aug 4, 2022
Merged

CI: Partially enable RHCOS 9 & SCOS testing#937
openshift-ci[bot] merged 3 commits intoopenshift:masterfrom
travier:scos-ci3

Conversation

@travier
Copy link
Copy Markdown
Member

@travier travier commented Aug 4, 2022

Let's enable some CI that works right now so that at least we don't regress.


manifests: Add shared manifest for EL9 variants


repos: Update C9S SIG NFV repo name


ci: Partially enable RHCOS 9 & SCOS testing

  • Only build RHCOS9, only run basic tests for SCOS
  • Includes temporary workaround for variant selection for non default
    variants. Will be removed once COSA support for variants is completed.

travier added 3 commits August 4, 2022 11:46
- Only build RHCOS9, only run basic tests for SCOS
- Includes temporary workaround for variant selection for non default
  variants. Will be removed once COSA support for variants is completed.
@travier travier changed the title manifests: Add shared manifest for EL9 variants CI: Partially enable RHCOS 9 & SCOS testing Aug 4, 2022
@openshift-ci openshift-ci Bot requested review from jlebon and jschintag August 4, 2022 09:52
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2022
Comment thread extensions-rhel-9.0.yaml
repos:
- rhel-9-nfv
# Temporarily included for kata-containers
- rhel-8-server-ose
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.

On this topic, one thing we should probably support in rpm-ostree is to have repos mentioned in repo-packages be enabled but used only for the mentioned packages. This would make things like this cleaner, so that we don't accidentally also ship other things from that repo that we didn't intend because of EVR ordering funkiness.

Copy link
Copy Markdown
Member Author

@travier travier Aug 4, 2022

Choose a reason for hiding this comment

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

Agree. Right now I'm doing that manually in the repo configs: https://github.com/openshift/os/pull/937/files#diff-cf4ac67e6195e36ef10dd53e72af30a0346517d3faf3857f88e74204c7373e3bR94

        # Temporary workaround until we have all packages for RHCOS 9
        curl -L "http://base-${ocpver_mut}-rhel86.ocp.svc.cluster.local" -o "src/config/tmp.repo"
        awk '/rhel-8-server-ose/,/^$/' "src/config/tmp.repo" > "src/config/ocp86.repo"
        echo "includepkgs=kata-containers,skopeo" >> "src/config/ocp86.repo"
        rm "src/config/tmp.repo"

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.

LGTM! I didn't review the symlink handling bits in depth (since we're cleaning that up soon anyway).

Comment thread ci/prow-entrypoint.sh
kola_test_metal_light
# kola_test_metal
;;
"explicitely-disabled-test")
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.

What's this about?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It's a way to have an entry-point for Prow that works but does nothing so that we can add new tests in the Prow config without having to do changes in this repo first.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

  1. Add a new test in openshift/release that calls this name
  2. Make a PR that changes what this does
  3. When ready, update openshift/release to get a new name
  4. update your PR for the new name and merge

Without that, you have to hijack an existing test to test a new one without breaking CI for other PRs.

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.

Gotcha, makes sense. Might help to add a comment there explaining that. Then we can link to it too for anyone working on adding new tests.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Thinking about this more, I've simplified it in a5d371c (#905)

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Aug 4, 2022

Aside: re. the Prow tests, any reason we don't combine the -qemu and -metal ones into a single test? E.g. have only rhcos-86-build-test.

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Aug 4, 2022

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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 lgtm Indicates that a PR is ready to be merged. label Aug 4, 2022
@travier
Copy link
Copy Markdown
Member Author

travier commented Aug 4, 2022

Aside: re. the Prow tests, any reason we don't combine the -qemu and -metal ones into a single test? E.g. have only rhcos-86-build-test.

That's what we had before but this meant that we had a single test that lasted 3-4h. The two tests right now take 1h30 (qemu) and 2h30 (metal).

I'll make a test PR to see how things look like now if we merge the tests.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 4, 2022

@travier: 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.

@openshift-ci openshift-ci Bot merged commit d28bedc into openshift:master Aug 4, 2022
@travier travier deleted the scos-ci3 branch August 5, 2022 08:45
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 5, 2022
travier added a commit to travier/os that referenced this pull request Aug 8, 2022
travier added a commit to travier/os that referenced this pull request Aug 8, 2022
travier added a commit to travier/os that referenced this pull request Aug 9, 2022
travier added a commit to travier/os that referenced this pull request Aug 10, 2022
travier added a commit to travier/os that referenced this pull request Aug 10, 2022
travier added a commit to travier/os that referenced this pull request Aug 11, 2022
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants