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

OCPBUGS-18545: CORS-2445: GCP: Add osImage to the install config #7468

Merged
merged 2 commits into from Sep 14, 2023
Merged

OCPBUGS-18545: CORS-2445: GCP: Add osImage to the install config #7468

merged 2 commits into from Sep 14, 2023

Conversation

barbacbd
Copy link
Contributor

@barbacbd barbacbd commented Sep 5, 2023

  • The initial stage towards enabling users to specify a boot images from Google Cloud Marketplace. This involves the introduction of a new field called oSImage. Within this field, users can indicate the project and name of the desired image.
  • Fixup tests and added generated data.
  • Updated google compute version to the minimum version where Architecture is a valid field in the Image struct. The field is required for GCP marketplace images.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 5, 2023
@openshift-ci-robot
Copy link
Contributor

@barbacbd: This pull request references Jira Issue OCPBUGS-18545, which is invalid:

  • expected the bug to target the "4.11.z" version, but it targets "4.12.z" instead
  • expected dependent Jira Issue OCPBUGS-17823 to target a version in 4.12.0, 4.12.z, but it targets "4.13.z" 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.

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

In response to this:

  • The initial stage towards enabling users to specify a boot images from Google Cloud Marketplace. This involves the introduction of a new field called oSImage. Within this field, users can indicate the project and name of the desired image.
  • Fixup tests and added generated data.
  • Updated google compute version to the minimum version where Architecture is a valid field in the Image struct. The field is required for GCP marketplace images.

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.

@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 5, 2023

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 5, 2023
@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 5, 2023

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@barbacbd: This pull request references Jira Issue OCPBUGS-18545, which is invalid:

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.

@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 5, 2023

/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. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 5, 2023
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-18320 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-18320 targets the "4.12.z" version, which is one of the valid target versions: 4.12.0, 4.12.z
  • bug has dependents

Requesting review from QA contact:
/cc @jianli-wei

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.

@jianli-wei
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 6, 2023
@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 6, 2023

/uncc @jstuever

@openshift-ci openshift-ci bot removed the request for review from jstuever September 6, 2023 13:43
@patrickdillon
Copy link
Contributor

/approve

@patrickdillon
Copy link
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 7, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 7, 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 Sep 7, 2023
@gpei
Copy link
Contributor

gpei commented Sep 7, 2023

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 7, 2023
@patrickdillon
Copy link
Contributor

/label backport-risk-assessed

Brent mentioned in slack that some further changes may be needed here, although it looks like this is testing well. If further changes are needed, let's re-evaluate this label.

@barbacbd barbacbd force-pushed the gcp-bootimage-override-4.11 branch 2 times, most recently from 8fe4390 to 4033b18 Compare September 8, 2023 13:28
@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 8, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 8, 2023
@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 8, 2023

/cc @r4f4

@openshift-ci openshift-ci bot requested a review from r4f4 September 8, 2023 16:36
@barbacbd
Copy link
Contributor Author

barbacbd commented Sep 8, 2023

/cc @cristianoveiga

mjpytlak
mjpytlak reviewed Sep 12, 2023
View reviewed changes
data/data/install.openshift.io_installconfigs.yaml Outdated
- name
- project
type: object
tags:
Copy link

Choose a reason for hiding this comment

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

@barbacbd Looks like you are introducing user specified tags here and on lines 1047 and 2238. Is that intentional? We released that enhancement in 4.12. https://issues.redhat.com/browse/CORS-2209

@jianli-wei
Copy link
Contributor

/hold

Please refer to comment, thanks!

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2023
AnnaZivkovic and others added 2 commits September 13, 2023 15:25
@barbacbd
OCPBUGS-18545: CORS-2445: GCP: Add osImage to the install config
c22ad83 
The initial stage towards enabling users to specify a boot images from Google Cloud Marketplace. This involves the introduction of a new field called oSImage. Within this field, users can indicate the project and name of the desired image.

Fixup tests and added generated data.
@barbacbd
** Updated to version 0.87.0 for google compute to allow the GCP Mark…
fcef8a5 
…etplace image to be used. This is

the minimal version of google compute where the Image contains the necessary fields including Architecture.
@barbacbd
Copy link
Contributor Author

@jianli-wei I pulled that data out of the PR (cherry-pick issues). Looks like it should mirror previous backports except for the dependency updates.

@jianli-wei
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2023
r4f4
r4f4 reviewed Sep 14, 2023
View reviewed changes
Copy link
Contributor

@r4f4 r4f4 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 Sep 14, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 455d518 and 2 for PR HEAD fcef8a5 in total

@barbacbd
Copy link
Contributor Author

/retest-required

@barbacbd
Copy link
Contributor Author

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Sep 14, 2023
@mjpytlak
Copy link

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 14, 2023

@barbacbd: 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-openstack fcef8a5 link false /test e2e-openstack
ci/prow/e2e-aws-proxy fcef8a5 link false /test e2e-aws-proxy
ci/prow/e2e-aws-shared-vpc fcef8a5 link false /test e2e-aws-shared-vpc
ci/prow/e2e-aws-single-node fcef8a5 link false /test e2e-aws-single-node
ci/prow/e2e-aws-upi-proxy fcef8a5 link false /test e2e-aws-upi-proxy
ci/prow/e2e-aws-imdsv2 fcef8a5 link false /test e2e-aws-imdsv2
ci/prow/e2e-crc fcef8a5 link false /test e2e-crc
ci/prow/e2e-ibmcloud fcef8a5 link false /test e2e-ibmcloud
ci/prow/okd-e2e-aws fcef8a5 link false /test okd-e2e-aws
ci/prow/e2e-aws-fips fcef8a5 link false /test e2e-aws-fips
ci/prow/e2e-libvirt fcef8a5 link false /test e2e-libvirt

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 f87b87d into openshift:release-4.11 Sep 14, 2023
23 of 34 checks passed
@openshift-ci-robot
Copy link
Contributor

@barbacbd: Jira Issue OCPBUGS-18545: All pull requests linked via external trackers have merged:

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

In response to this:

  • The initial stage towards enabling users to specify a boot images from Google Cloud Marketplace. This involves the introduction of a new field called oSImage. Within this field, users can indicate the project and name of the desired image.
  • Fixup tests and added generated data.
  • Updated google compute version to the minimum version where Architecture is a valid field in the Image struct. The field is required for GCP marketplace images.

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.11.0-0.nightly-2023-09-14-210203

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r4f4 r4f4 r4f4 left review comments

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

@jianli-wei jianli-wei Awaiting requested review from jianli-wei

@cristianoveiga cristianoveiga Awaiting requested review from cristianoveiga

@mjpytlak mjpytlak Awaiting requested review from mjpytlak

Assignees

@r4f4 r4f4

@mjpytlak mjpytlak

Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@barbacbd @openshift-ci-robot @jianli-wei @patrickdillon @gpei @mjpytlak @openshift-merge-robot @r4f4