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

oscontainer: Add support for --display-name #1104

Merged

Conversation

cgwalters
Copy link
Member

And if present, inject the OpenShift labels for machine-os.
Currently this is inlined for OKD (FCOS) in
https://github.com/openshift/release/blob/27a5d056b53aba5818795c2ee03d053f754d75da/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml#L533

This will be used for RHCOS to have its version appear in the
release image.

xref openshift/oc#209 (comment)

And if present, inject the OpenShift labels for `machine-os`.
Currently this is inlined for OKD (FCOS) in
https://github.com/openshift/release/blob/27a5d056b53aba5818795c2ee03d053f754d75da/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml#L533

This will be used for RHCOS to have its version appear in the
release image.

xref openshift/oc#209 (comment)
Copy link
Contributor

@darkmuggle darkmuggle left a comment

Choose a reason for hiding this comment

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

/approve

Looks good. Merge when ready.

@jlebon
Copy link
Member

jlebon commented Feb 5, 2020

/lgtm

@jlebon
Copy link
Member

jlebon commented Feb 5, 2020

/retest

@jlebon
Copy link
Member

jlebon commented Feb 5, 2020

/approve

@jlebon jlebon added the approved label Feb 5, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, darkmuggle, jlebon

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,darkmuggle,jlebon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 642955b into coreos:master Feb 5, 2020
arithx pushed a commit to arithx/coreos-assembler that referenced this pull request Feb 7, 2020
```
Benjamin Gilbert (3):
      cmd/ore/aws: let list-regions list disabled regions, or all regions
      Merge pull request coreos#1102 from bgilbert/regions
      Merge pull request coreos#1104 from jcajka/bcrypt

Jakub Čajka (1):
      kola/tests/rpmostree: use NVR instead of NVRA

Jonathan Lebon (5):
      auth/aliyun: fix parsing config file
      Merge pull request coreos#1105 from jlebon/pr/aliyun-profile-fix
      ore/aliyun: add --delete-object and default to true
      platform/api/aliyun: sprinkle with some logging
      Merge pull request coreos#1107 from jlebon/pr/aliyun-delete-object
```
jcajka pushed a commit to jcajka/coreos-assembler that referenced this pull request Mar 24, 2020
kola/tests/rpmostree: use NVR instead of NVRA
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants