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.

Sign up for GitHub

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

Jump to bottom

OKD-103: Build the machine-os-images image for OKD/SCOS #36453

Merged
merged 2 commits into from
Feb 20, 2023
Merged

OKD-103: Build the machine-os-images image for OKD/SCOS #36453

merged 2 commits into from
Feb 20, 2023

Conversation

LorbusChris
Copy link
Member

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 16, 2023 •
edited by openshift-ci bot

@LorbusChris: This pull request references OKD-103 which is a valid jira issue.

In response to this:

Also fixes: okd-project/okd#1506
/cc @vrutkovs @derekhiggins

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

@LorbusChris: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-machine-os-images-release-4.12-okd-images openshift/machine-os-images presubmit Ci-operator config changed
pull-ci-openshift-machine-os-images-release-4.14-okd-images openshift/machine-os-images presubmit Ci-operator config changed
pull-ci-openshift-machine-os-images-release-4.13-okd-images openshift/machine-os-images presubmit Ci-operator config changed
pull-ci-openshift-machine-os-images-main-okd-images openshift/machine-os-images presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse refresh to get an updated list of affected jobs (useful if you have new pushes to the branch)

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2023
@vrutkovs
Copy link
Member

You need to run make jobs to complete metadata

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2023
@vrutkovs
Copy link
Member

make ci-operator-config required

@vrutkovs
Copy link
Member

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Feb 16, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2023
@vrutkovs
Copy link
Member

/cc @dtantsur @elfosardo

@dtantsur
Copy link
Member

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 20, 2023
@LorbusChris
machine-os-images: Use OKD installer for OKD builds
dc5a785 
The OKD installer from the `origin` namespace has to be used in the
build in order to actually pull the FCOS bootimage.

Fixes: okd-project/okd#1506
@LorbusChris
machine-os-images: Add OKD/SCOS builds
ab6946b
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 20, 2023

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

@lmzuccarelli
Copy link
Contributor

/lgtm

1 similar comment
@sherine-k
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Feb 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur, lmzuccarelli, LorbusChris, sherine-k, vrutkovs

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

vrutkovs
vrutkovs reviewed Feb 20, 2023
View reviewed changes
...r/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd-scos.yaml
inputs:
ocp_4.12_installer:
as:
- registry.ci.openshift.org/ocp/4.12:installer
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- registry.ci.openshift.org/ocp/4.12:installer
- registry.ci.openshift.org/origin/scos-4.12:installer

vrutkovs
vrutkovs reviewed Feb 20, 2023
View reviewed changes
...r/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd-scos.yaml
inputs:
ocp_4.13_installer:
as:
- registry.ci.openshift.org/ocp/4.13:installer
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- registry.ci.openshift.org/ocp/4.13:installer
- registry.ci.openshift.org/origin/scos-4.13:installer

Copy link
Member Author

Choose a reason for hiding this comment

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

Doesn't this replace https://github.com/openshift/machine-os-images/blob/main/Dockerfile#L1 and is correct here?

vrutkovs
vrutkovs reviewed Feb 20, 2023
View reviewed changes
...r/config/openshift/machine-os-images/openshift-machine-os-images-release-4.14__okd-scos.yaml
inputs:
ocp_4.13_installer:
as:
- registry.ci.openshift.org/ocp/4.13:installer
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- registry.ci.openshift.org/ocp/4.13:installer
- registry.ci.openshift.org/origin/scos-4.13:installer

@openshift-merge-robot openshift-merge-robot merged commit b28d4e0 into openshift:master Feb 20, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 20, 2023

@LorbusChris: Updated the following 7 configmaps:

  • ci-operator-master-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-main__okd.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
  • ci-operator-4.12-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.12__okd-scos.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd-scos.yaml
    • key openshift-machine-os-images-release-4.12__okd.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd.yaml
  • ci-operator-4.13-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.13__okd-scos.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd-scos.yaml
    • key openshift-machine-os-images-release-4.13__okd.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd.yaml
  • ci-operator-4.14-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.14__okd-scos.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.14__okd-scos.yaml
    • key openshift-machine-os-images-release-4.14__okd.yaml using file ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.14__okd.yaml
  • job-config-4.12 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.12-postsubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.12-postsubmits.yaml
    • key openshift-machine-os-images-release-4.12-presubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.12-presubmits.yaml
  • job-config-4.13 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.13-postsubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.13-postsubmits.yaml
    • key openshift-machine-os-images-release-4.13-presubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.13-presubmits.yaml
  • job-config-4.14 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-machine-os-images-release-4.14-postsubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.14-postsubmits.yaml
    • key openshift-machine-os-images-release-4.14-presubmits.yaml using file ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-release-4.14-presubmits.yaml

In response to this:

Also fixes: okd-project/okd#1506
/cc @vrutkovs @derekhiggins

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
Reviewers

@vrutkovs vrutkovs vrutkovs approved these changes

@derekhiggins derekhiggins Awaiting requested review from derekhiggins

@dtantsur dtantsur Awaiting requested review from dtantsur

@elfosardo elfosardo Awaiting requested review from elfosardo

Assignees

@vrutkovs vrutkovs

@sherine-k sherine-k

@lmzuccarelli lmzuccarelli

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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
Milestone
No milestone
7 participants
@LorbusChris @openshift-ci-robot @vrutkovs @dtantsur @lmzuccarelli @sherine-k @openshift-merge-robot