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

OCPBUGS-595: overlay: Add rhcos-selinux-policy-upgrade.service #962

Merged

Conversation

cgwalters
Copy link
Member

This will auto rebuild the policy if we detect local modifications;
it is only needed before RHEL 8.7 when we'll pick up the
combined underlying work from
https://bugzilla.redhat.com/show_bug.cgi?id=2057497

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 29, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 29, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@cgwalters cgwalters changed the title overlay: Add rhcos-selinux-policy-upgrade.service OCPBUGS-595: overlay: Add rhcos-selinux-policy-upgrade.service Aug 29, 2022
@openshift-ci-robot openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Aug 29, 2022
@openshift-ci-robot
Copy link

@cgwalters: This pull request references Jira Issue OCPBUGS-595, which is invalid:

  • expected the bug to target the "4.12.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

This will auto rebuild the policy if we detect local modifications;
it is only needed before RHEL 8.7 when we'll pick up the
combined underlying work from
https://bugzilla.redhat.com/show_bug.cgi?id=2057497

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 29, 2022
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 29, 2022
@cgwalters
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@cgwalters: This pull request references Jira Issue OCPBUGS-595, which is invalid:

  • expected the bug to target the "4.12.0" version, but it targets "4.12" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@cgwalters
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 29, 2022
@openshift-ci-robot
Copy link

@cgwalters: This pull request references Jira Issue OCPBUGS-595, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.0) matches configured target version for branch (4.12.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mike-nguyen

In response to this:

/jira refresh

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.

@cgwalters cgwalters marked this pull request as ready for review August 29, 2022 17:17
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 29, 2022
@cgwalters
Copy link
Member Author

OK lifting draft, now tested manually, and I added an automated kola test.

*) echo "Assuming we have new enough ostree"; exit 0;;
esac

ls -al /{usr/,}etc/selinux/targeted/policy/policy.31
Copy link
Member

Choose a reason for hiding this comment

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

I'm not 100% sure this is stable across all of our releases.

Copy link
Member Author

Choose a reason for hiding this comment

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

Just above this, we exit if the OS isn't RHEL 8.[0-6]. This code very intentionally will not run on RHEL9, because we don't need it there.

@travier
Copy link
Member

travier commented Aug 29, 2022

/lgtm cancel

@travier
Copy link
Member

travier commented Aug 29, 2022

OK, I've verified that it is .31 on 4.8 so that's good enough.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 29, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD e6acd9f and 8 for PR HEAD 87e93c2 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD e6acd9f and 7 for PR HEAD 87e93c2 in total

@cgwalters
Copy link
Member Author

/skip

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD 31132b4 and 7 for PR HEAD c43686d in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 31132b4 and 6 for PR HEAD c43686d in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD 123b70c and 5 for PR HEAD c43686d in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD 123b70c and 4 for PR HEAD c43686d in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 123b70c and 3 for PR HEAD c43686d in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2022
@cgwalters
Copy link
Member Author

Hmm I swear I pushed a fix for the case of c9s yesterday, but not seeing it here. Anyways I just changed it to use ${RHEL_VERSION:-} consistently so we don't error out if it's unset.

@cgwalters
Copy link
Member Author

Ahh I did push that attempted change but to the test code, not the core logic 🤦 - they're both similar looking shell scripts. Fixed.

This will auto rebuild the policy if we detect local modifications;
it is only needed before RHEL 8.7 when we'll pick up the
combined underlying work from
https://bugzilla.redhat.com/show_bug.cgi?id=2057497
@travier
Copy link
Member

travier commented Aug 30, 2022

Wrote commit: 193b3ec7eef58756c1ba2577e236bd7deb07ba034a1613fb74f41f642a49d031
mv: cannot move 'cache/output.tar' to '/tmp/cosa/tmp/repo/commit.tar': Cannot allocate memory

We might need to request more memory for this pod?

@cgwalters
Copy link
Member Author

We might need to request more memory for this pod?

That looks like another instance of coreos/coreos-assembler#2940 (comment) - more memory won't help, it's a 9p bug.

@cgwalters
Copy link
Member Author

/retest

Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jmarrero, 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:
  • OWNERS [cgwalters,jmarrero,travier]

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
Member

travier commented Aug 30, 2022

Failed at the 3h mark due to timeout.

@travier
Copy link
Member

travier commented Aug 30, 2022

/test ci/prow/rhcos-86-build-test-qemu

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2022

@travier: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test images
  • /test periodic-images
  • /test rhcos-86-build-test-metal
  • /test rhcos-86-build-test-qemu
  • /test rhcos-90-build-test-metal
  • /test rhcos-90-build-test-qemu
  • /test scos-9-build-test-metal
  • /test scos-9-build-test-qemu
  • /test validate

Use /test all to run all jobs.

In response to this:

/test ci/prow/rhcos-86-build-test-qemu

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.

@travier
Copy link
Member

travier commented Aug 30, 2022

/test rhcos-86-build-test-qemu

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2022

@cgwalters: all tests passed!

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.

@openshift-merge-robot openshift-merge-robot merged commit ecef30e into openshift:master Aug 30, 2022
@openshift-ci-robot
Copy link

@cgwalters: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-595 has been moved to the MODIFIED state.

In response to this:

This will auto rebuild the policy if we detect local modifications;
it is only needed before RHEL 8.7 when we'll pick up the
combined underlying work from
https://bugzilla.redhat.com/show_bug.cgi?id=2057497

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.

@cgwalters
Copy link
Member Author

/cherrypick release-4.11

@openshift-cherrypick-robot

@cgwalters: new pull request created: #966

In response to this:

/cherrypick release-4.11

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.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants