HIVE-2862: Remove python dependency from makefile #2692
Conversation
This change allows building the container images without the python dependencies that are getting harder to get by. Signed-off-by: Antoni Segura Puimedon <[email protected]>
|
@dlom: This pull request references HIVE-2862 which is a valid jira issue. 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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
added
the
jira/valid-reference
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dlom 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
bot
added
the
approved
| } | ||
|
|
||
| function short_sha() { | ||
| git rev-parse --short HEAD |
There was a problem hiding this comment.
To be compatible with the existing functionality, this should be
| git rev-parse --short HEAD | |
| git rev-parse --short=7 HEAD |
| git rev-parse --short HEAD | ||
| } | ||
|
|
||
| echo "$(prefix_from_branch "$(git rev-parse --abbrev-ref HEAD)").$(commit_count)-$(short_sha)" |
There was a problem hiding this comment.
To be compatible with the existing functionality, we need to include the v prefix, so either here via
| echo "$(prefix_from_branch "$(git rev-parse --abbrev-ref HEAD)").$(commit_count)-$(short_sha)" | |
| echo v"$(prefix_from_branch "$(git rev-parse --abbrev-ref HEAD)").$(commit_count)-$(short_sha)" |
...or in the Makefile as noted above.
| SOURCE_GIT_TAG := $(shell export HOME=$(HOME); python3 -m ensurepip >&2; python3 -mpip --no-cache install --user gitpython pyyaml >&2; hack/version2.py) | ||
| # 0.0.x-y if it is an `UnknownBranch`. However, the {commitcount} and {sha} | ||
| # should still be accurate. | ||
| SOURCE_GIT_TAG := $(shell hack/version2.sh) |
There was a problem hiding this comment.
To be compatible with the existing functionality, this needs to include the v prefix, either by prepending it here
| SOURCE_GIT_TAG := $(shell hack/version2.sh) | |
| SOURCE_GIT_TAG := v$(shell hack/version2.sh) |
...or by including it in the output of version2.sh as noted below.
There was a problem hiding this comment.
We should be able to delete version2.py as part of this PR, yes?
|
Looks like you're either going to have to install pyyaml as part of |
|
@dlom: The following test failed, say
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-sigs/prow repository. I understand the commands that are listed here. |
This change allows building the container images without the python dependencies that are getting harder to get by.
xref: HIVE-2862