Skip to content
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

NO-JIRA: ci: Use 'centos-release' package to detect if we are testing CentOS Stream #1448

Merged

Conversation

travier
Copy link
Member

@travier travier commented Feb 26, 2024

ci: Use 'centos-release' package to detect if we are testing CentOS Stream

Until #1237 is resolved, we need
to skip Secure Boot tests for CentOS Stream based variants.

As we now use CentOS Stream packages for other variants than the scos
one for pre-testing, we can not rely on the variant name and instead
have to look at the list of included packages to differentiate between
RHEL and CentOS Stream based builds.


kola-denylist: Do not snooze basic tests anymore

Secure Boot tests are now skipped in the CI based on wether or not we
are using CentOS Stream content.


kola-denylist: Update RHCOS 9.4 snooze dates


kola-denylist: Use uniform identing


kola-denylist: Regroup test snooze by variant

…tream

Until openshift#1237 is resolved, we need
to skip Secure Boot tests for CentOS Stream based variants.

As we now use CentOS Stream packages for other variants than the `scos`
one for pre-testing, we can not rely on the variant name and instead
have to look at the list of included packages to differentiate between
RHEL and CentOS Stream based builds.
@travier travier changed the title ci: Use 'centos-release' package to detect if we are testing CentOS S… ci: Use 'centos-release' package to detect if we are testing CentOS Stream Feb 26, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2024
@travier travier changed the title ci: Use 'centos-release' package to detect if we are testing CentOS Stream NO-JIRA: ci: Use 'centos-release' package to detect if we are testing CentOS Stream Feb 26, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 26, 2024
@openshift-ci-robot
Copy link

@travier: This pull request explicitly references no jira issue.

In response to this:

Until #1237 is resolved, we need to skip Secure Boot tests for CentOS Stream based variants.

As we now use CentOS Stream packages for other variants than the scos one for pre-testing, we can not rely on the variant name and instead have to look at the list of included packages to differentiate between RHEL and CentOS Stream based builds.

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 openshift-eng/jira-lifecycle-plugin repository.

@jbtrystram
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024
@travier
Copy link
Member Author

travier commented Feb 26, 2024

Updated to take into account kola test snooze that expired.

@jbtrystram
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024
Copy link
Contributor

openshift-ci bot commented Feb 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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-merge-bot openshift-merge-bot bot merged commit 1bba52e into openshift:master Feb 26, 2024
7 checks passed
Copy link
Contributor

openshift-ci bot commented Feb 26, 2024

@travier: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/rhcos-9-build-test-qemu 058f5ca link unknown /test rhcos-9-build-test-qemu

Full PR test history. Your PR dashboard.

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.

@travier travier deleted the ci-skip-secure-boot-centos-stream branch February 26, 2024 23:36
variant="default"
fi
if [[ "${variant}" != "scos" ]]; then
if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "centos-release"; then
Copy link
Member

Choose a reason for hiding this comment

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

This logic looks inverted. If centos-release is present then we need to skip Secure Boot tests, not the other way around.

I think the reason this passed CI is that this condition happened to fail on another error, which is that manifest is not defined:

/src/ci/prow-entrypoint.sh: line 126: manifest: unbound variable

And I think the reason set -e didn't kick in here is likely a combination of it being in an if-statement and piping things.

Copy link
Member

Choose a reason for hiding this comment

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

Proposing to fix this in #1458.

Copy link
Member Author

Choose a reason for hiding this comment

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

Arg, thanks for noticing

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants