Skip to content

Makefile: Use the full git commit hash when building binaries #33

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

Merged
merged 1 commit into from
Mar 31, 2021

Conversation

timflannagan
Copy link
Contributor

Update the root Makefile and copy-paste the GIT_COMMIT from the
staging/operator-lifecycle-manager/Makefile that checks if any of the
ART-defined environment variables are present in the build environment,
and falling back to the full git commit hash.

This is important as there's existing tests in openshift/origin that
verify that full commit hash is present when running the
version/--version command/flags for the OLM and registry binaries.

Update the root Makefile and copy-paste the GIT_COMMIT from the
staging/operator-lifecycle-manager/Makefile that checks if any of the
ART-defined environment variables are present in the build environment,
and falling back to the full git commit hash.

This is important as there's existing tests in openshift/origin that
verify that full commit hash is present when running the
version/--version command/flags for the OLM and registry binaries.
@timflannagan
Copy link
Contributor Author

Link to a rehearsal that caught this when attempting to promote from the downstream monorepo instead of the upstream equivalents: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/17323/rehearse-17323-pull-ci-openshift-operator-framework-olm-release-4.9-e2e-gcp/1376992350034726912.

@timflannagan
Copy link
Contributor Author

Need to land this before merging openshift/release #17323.

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 31, 2021
@exdx
Copy link
Contributor

exdx commented Mar 31, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 31, 2021

@timflannagan: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-upgrade eb653bc link /test e2e-upgrade

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

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit b2c0188 into openshift:master Mar 31, 2021
@timflannagan timflannagan deleted the fix-version branch March 31, 2021 16:18
ankitathomas pushed a commit to ankitathomas/operator-framework-olm that referenced this pull request Apr 6, 2021
Remove Bundle validator from the validator list

(cherry picked from commit 363b6d81f4a8eda3f73f09fbd3fb8d655fcc6661)
ankitathomas pushed a commit to ankitathomas/operator-framework-olm that referenced this pull request Apr 6, 2021
Remove Bundle validator from the validator list

(upstream api commit: 363b6d81f4a8eda3f73f09fbd3fb8d655fcc6661)
ankitathomas pushed a commit to ankitathomas/operator-framework-olm that referenced this pull request Apr 9, 2021
Remove Bundle validator from the validator list

(upstream api commit: 363b6d81f4a8eda3f73f09fbd3fb8d655fcc6661)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants