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-9982: bootstrap-pivot: skip pivot in SCOS Live ISO #6965

Merged

Conversation

vrutkovs
Copy link
Member

If bootstrap is running in a Live ISO of SCOS rpm-ostree pivot will fail as /usr is not writable. Live ISO is used in assisted-installer flow and it doesn't need to pivot machine-os-content during bootstrap (it would write SCOS image on disk and run pivot via machine-config-daemon-pivot service).

This change unblocks OKD Stream isntall using assisted-installer

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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. labels Mar 10, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-9982, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact:
/cc @gpei

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

If bootstrap is running in a Live ISO of SCOS rpm-ostree pivot will fail as /usr is not writable. Live ISO is used in assisted-installer flow and it doesn't need to pivot machine-os-content during bootstrap (it would write SCOS image on disk and run pivot via machine-config-daemon-pivot service).

This change unblocks OKD Stream isntall using assisted-installer

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.

@r4f4
Copy link
Contributor

r4f4 commented Mar 11, 2023

/retest-required

@patrickdillon
Copy link
Contributor

/approve
/retest

@patrickdillon
Copy link
Contributor

retesting, hopefully we'll see some scos tests not get rate limited

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 13, 2023
@vrutkovs vrutkovs changed the title OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO WIP OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO Mar 14, 2023
@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 Mar 14, 2023
@vrutkovs

This comment was marked as outdated.

@vrutkovs vrutkovs force-pushed the scos-skip-pivot-on-live-iso branch from 707bbbd to a7d9218 Compare March 14, 2023 08:42
@vrutkovs vrutkovs changed the title WIP OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO OCPBUGS-9982: bootstrap-pivot: skip pivot in SCOS Live ISO Mar 14, 2023
@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 Mar 14, 2023
@vrutkovs
Copy link
Member Author

/refresh

@vrutkovs
Copy link
Member Author

/test okd-e2e-aws-ovn

If bootstrap is running in a Live ISO of SCOS `rpm-ostree pivot` will
fail as /usr is not writable. Live ISO is used in assisted-installer
flow and it doesn't need to pivot machine-os-content during bootstrap
(it would write SCOS image on disk and run pivot via
machine-config-daemon-pivot service). This change unblocks OKD Stream
isntall using assisted-installer
@vrutkovs vrutkovs force-pushed the scos-skip-pivot-on-live-iso branch from ded6ddc to ba72368 Compare March 15, 2023 15:23
@vrutkovs
Copy link
Member Author

okd-scos-e2e-aws-ovn is looking good now
/test e2e-aws-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2023

@vrutkovs: The following tests 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/e2e-aws-ovn-public-subnets a7d9218 link false /test e2e-aws-ovn-public-subnets
ci/prow/okd-scos-e2e-aws-upgrade ba72368 link false /test okd-scos-e2e-aws-upgrade
ci/prow/okd-scos-e2e-aws-ovn ba72368 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-agent-ha-dualstack ba72368 link false /test e2e-agent-ha-dualstack
ci/prow/okd-e2e-aws-ovn-upgrade ba72368 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-aws-ovn-upgrade ba72368 link false /test e2e-aws-ovn-upgrade

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.

@sherine-k
Copy link
Contributor

@patrickdillon @jhixson74
Do you think this can be merged?

@sherine-k
Copy link
Contributor

/retest-required

@patrickdillon
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 23, 2023
@openshift-merge-robot openshift-merge-robot merged commit 670f501 into openshift:master Mar 23, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: Jira Issue OCPBUGS-9982: All pull requests linked via external trackers have merged:

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

In response to this:

If bootstrap is running in a Live ISO of SCOS rpm-ostree pivot will fail as /usr is not writable. Live ISO is used in assisted-installer flow and it doesn't need to pivot machine-os-content during bootstrap (it would write SCOS image on disk and run pivot via machine-config-daemon-pivot service).

This change unblocks OKD Stream isntall using assisted-installer

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.

# Exit early if pivot is attempted on SCOS Live ISO
{{if .IsSCOS -}}
source /etc/os-release
if [[ ! $(touch /usr/.test) ]] && [[ ${ID} =~ ^(centos)$ ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

It's not going to work on any live ISO right? As we move towards potentially doing openshift/os#799 we'll also want to have this change for OCP/RHEL.

That said, I think the Live ISO case is going to have interesting issues here. What we probably want to support is a case where we do dynamic overlays of things like kubelet and other tools, without a reboot.

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, that script would fail on any LiveISO, but we run boostrap-pivot on OKD only. The CentOS guard here is because OKD SCOS can start via:

  • FCOS in IPI
  • LiveISO SCOS in Assisted Installer

Copy link
Member

Choose a reason for hiding this comment

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

Right, but I'm saying we're at least potentially going to make the same change for OCP to ship disk images that are pure RHEL content. (enhancement etc. to be written; no action required now, just noting)

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, yes, in that case we'll need something similar - and it would be a great opportunity to rework bootstrap-pivot entirely

@vrutkovs
Copy link
Member Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@vrutkovs: new pull request created: #7020

In response to this:

/cherry-pick release-4.13

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/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.

8 participants