Bug 1769578: Specfile: Make %global commit ... overridable

[LorbusChris]

Backport of #1225
Blocks: openshift/release#5572

- What I did
Make %global commit foo overridable with rpmbuild --define "commit bar"

- How to verify it
CI does not break

- Description for the changelog
Specfile: Make %global commit ... overridable

[kikisdeliveryservice]

I've not touched this file, someone else should take a look..

/hold
/assign @cgwalters

[ashcrow]

/override ci/prow/e2e-aws-scaleup-rhel7

[openshift-ci-robot]

@ashcrow: Overrode contexts on behalf of ashcrow: ci/prow/e2e-aws-scaleup-rhel7

Details

In response to this:

/override ci/prow/e2e-aws-scaleup-rhel7

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]

@LorbusChris: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	6144caa	link	/test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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-ci-robot]

@LorbusChris: This pull request references Bugzilla bug 1769578, which is invalid:

• expected the bug to target the "4.3.0" release, but it targets "---" instead

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.

Details

In response to this:

Bug 1769578: Specfile: Make %global commit ... overridable

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.

[kikisdeliveryservice]

/cherrypick release-4.2

[openshift-cherrypick-robot]

@kikisdeliveryservice: once the present PR merges, I will cherry-pick it on top of release-4.2 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.2

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.

[kikisdeliveryservice]

/bugzilla refresh

[openshift-ci-robot]

@kikisdeliveryservice: This pull request references Bugzilla bug 1769578, 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.

Details

In response to this:

/bugzilla 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.

[kikisdeliveryservice]

Already have the backport PR open so:
(not sure this is a real command but yolo)

/cherrypick release-4.2 cancel

[openshift-cherrypick-robot]

@kikisdeliveryservice: once the present PR merges, I will cherry-pick it on top of release-4.2 cancel in a new PR and assign it to you.

Details

In response to this:

Already have the backport PR open so:
(not sure this is a real command but yolo)

/cherrypick release-4.2 cancel

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.

[kikisdeliveryservice]

/skip

[ashcrow]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashcrow, LorbusChris

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [LorbusChris,ashcrow]

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

[LorbusChris]

thanks @kikisdeliveryservice and @ashcrow! any reason left not to lift the hold?

[ashcrow]

/hold cancel

[openshift-ci-robot]

@LorbusChris: All pull requests linked via external trackers have merged. Bugzilla bug 1769578 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1769578: Specfile: Make %global commit ... overridable

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-cherrypick-robot]

@kikisdeliveryservice: #1226 failed to apply on top of branch "release-4.2":
```Applying: Specfile: Make %global commit ... overridable
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M machine-config-daemon.spec
Falling back to patching base and 3-way merge...
Auto-merging machine-config-daemon.spec
CONFLICT (content): Merge conflict in machine-config-daemon.spec
Patch failed at 0001 Specfile: Make `%global commit ...` overridable

<details>

In response to [this](https://github.com/openshift/machine-config-operator/pull/1226#issuecomment-550525033):

>/cherrypick release-4.2


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

[openshift-cherrypick-robot]

@kikisdeliveryservice: cannot checkout release-4.2 cancel: error checking out release-4.2 cancel: exit status 1. output: error: pathspec 'release-4.2 cancel' did not match any file(s) known to git.

Details

In response to this:

Already have the backport PR open so:
(not sure this is a real command but yolo)

/cherrypick release-4.2 cancel

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.