hack/lib/build/version: Use BUILD_VERSION and SOURCE_GIT_COMMIT if non-empty #133
Conversation
openshift-ci-robot
added
the
size/M
…n-empty
Avoid:
I0207 15:51:43.662541 1 builder.go:425] openshift-builder v4.3.0-202001211731+b93dcc9-dirty
in 4.3.0 builder logs, which is from Git looking at the build
directory and seeing:
* The commit b93dcc9, which is in the dist-git repository, not in
openshift/builder. The commit hash logged for 4.3.0 should
have been:
$ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.3.0-x86_64 | grep builder
docker-builder https://github.com/openshift/builder 50c6e17
* -dirty because Doozer is adjusting our Dockerfile?
With this commit we pivot to BUILD_VERSION and SOURCE_GIT_COMMIT,
set by Doozer since [1] and [2] respectively. If either is
unset, we fall back to Git calls in the local repository.
[1]: https://gitlab.cee.redhat.com/openshift-art/tools/doozer/commit/b02114a0bb26bbb7f60f1cc484c17fc3172c6df4
distgit.py: ART-165 add build ENV vars, 2019-07-07
[2]: https://gitlab.cee.redhat.com/openshift-art/tools/doozer/commit/204f92b328b28b696cf112444c1da797f8d57fd7
distgit: OS_GIT_COMMIT -> SOURCE_GIT_COMMIT, 2019-05-14
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: adambkaplan, wking 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 |
openshift-ci-robot
added
the
approved
|
/cherrypick release-4.4 |
|
@adambkaplan: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you. In response to this:
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. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@adambkaplan: new pull request created: #139 In response to this:
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. |
Avoid:
in 4.3.0 builder logs, which is from Git looking at the build directory and seeing:
The commit b93dcc9, which is in the dist-git repository, not in openshift/builder. The commit hash logged for 4.3.0 should have been:
-dirtybecause Doozer is adjusting ourDockerfile?With this commit we pivot to
BUILD_VERSIONandSOURCE_GIT_COMMIT, set by Doozer since here and here respectively (internal Red Hat links; sorry external folks). If either is unset, we fall back to Git calls in the local repository.