[release-4.9] Bug 2008619: UPSTREAM: <carry>: openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc. #983

openshift-cherrypick-robot · 2021-09-28T16:08:24Z

This is an automated cherry-pick of #963

/assign dagrayvid

…ift.build.versions, etc. For example, consider the current 4.10 RHCOS: $ oc image info -o json registry.ci.openshift.org/ocp/4.10:machine-os-content | jq -r '.config.config.Labels | to_entries[] | .key + ": " + .value' | grep '^io\.k8s\|^io\.openshift' io.k8s.description: The Universal Base Image is designed and engineered to be the base layer for all of your containerized applications, middleware and utilities. This base image is freely redistributable, but Red Hat only supports Red Hat technologies through subscriptions for Red Hat products. This image is maintained by Red Hat and updated regularly. io.k8s.display-name: Red Hat Universal Base Image 8 io.openshift.build.version-display-names: machine-os=Red Hat Enterprise Linux CoreOS io.openshift.build.versions: machine-os=49.84.202109102026-0 io.openshift.expose-services: io.openshift.tags: base rhel8 A bunch of those seem to be inherited from the UBI base image, so we can leave them alone. But the io.openshift.build.* entries are RHCOS-specific, and are consumed by 'oc adm release new ...' [1,2] and friends to answer questions like "which RHCOS is in this release?": $ oc adm release info -o json quay.io/openshift-release-dev/ocp-release:4.8.12-x86_64 | jq .displayVersions { "kubernetes": { "Version": "1.21.1", "DisplayName": "" }, "machine-os": { "Version": "48.84.202109100857-0", "DisplayName": "Red Hat Enterprise Linux CoreOS" } } Setting this label will avoid failures when consumers like driver-toolkit's version consumer [3]: name: 0.0.1-snapshot-machine-os bump into ci-tools-built machine-os-content images that lack the io.openshift.build.versions declaration of machine-os version [4]: error: unable to create a release: unknown version reference "machine-os" I've gone with generic testing values, so hopefully this is not something that local maintainers need to remember to bump for each OpenShift z stream. [1]: https://github.com/openshift/oc/blob/f94afb52dc8a3185b3b9eacaf92ec34d80f8708d/pkg/cli/admin/release/image_mapper.go#L328-L334 [2]: https://github.com/openshift/oc/blob/f94afb52dc8a3185b3b9eacaf92ec34d80f8708d/pkg/cli/admin/release/annotations.go#L19-L28 [3]: openshift/driver-toolkit@464acca#diff-4caed9b2b966a8fa7a016ae28976634a2d3d1b635c4e820d5c038b2305d6af53R18 [4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_kubernetes/959/pull-ci-openshift-kubernetes-master-images/1438398678602616832#1:build-log.txt%3A97

openshift-ci-robot · 2021-09-28T16:08:32Z

@openshift-cherrypick-robot: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

e18438e|UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc.: does not specify an upstream backport in the commit message

dagrayvid · 2021-09-28T16:17:06Z

/retitle [release-4.9] Bug 2008290: UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc.

openshift-ci · 2021-09-28T16:17:11Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2008290, which is invalid:

expected the bug to target the "4.9.0" release, but it targets "---" instead
expected Bugzilla bug 2008290 to depend on a bug targeting a release in 4.10.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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

In response to this:

[release-4.9] Bug 2008290: UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc.

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.

dagrayvid · 2021-09-28T17:39:01Z

/retitle [release-4.9] Bug 2008619: UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc.

openshift-ci · 2021-09-28T17:39:09Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2008619, 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.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.0) matches configured target release for branch (4.9.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2008290 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Bugzilla bug 2008290 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
bug has dependents

Requesting review from QA contact:
/cc @wabouhamad

In response to this:

[release-4.9] Bug 2008619: UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc.

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.

sttts · 2021-09-28T17:55:17Z

/lgtm
/approve

openshift-ci · 2021-09-28T17:58:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, soltysh, sttts

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:

~~DOWNSTREAM_OWNERS~~ [soltysh,sttts]

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

openshift-ci · 2021-09-28T18:09:54Z

@openshift-cherrypick-robot: 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-csi-manila	`e18438e`	link	false	`/test e2e-openstack-csi-manila`
ci/prow/e2e-agnostic-cmd	`e18438e`	link	false	`/test e2e-agnostic-cmd`
ci/prow/e2e-openstack-csi-cinder	`e18438e`	link	false	`/test e2e-openstack-csi-cinder`

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-bot · 2021-09-28T18:29:13Z

/retest-required