chore: Fix warnings during image build. #3172
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alanconway The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
| # Set variables from environment or hard-coded default | ||
| export OPERATOR_NAME=cluster-logging-operator | ||
| export CURRENT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD;) | ||
| export CURRENT_BRANCH=$(shell git rev-parse --short HEAD 2> /dev/null) |
There was a problem hiding this comment.
| export CURRENT_BRANCH=$(shell git rev-parse --short HEAD 2> /dev/null) | |
| export CURRENT_BRANCH=$(shell git rev-parse --short HEAD 2> /dev/null) |
fwiw: "current branch" is then also wrong as the output of rev-parse --short HEAD will always be a commit-hash.
| # builds an operator-registry image containing the cluster-logging operator | ||
| cluster-logging-catalog-build: .target/cluster-logging-catalog-build | ||
| .target/cluster-logging-catalog-build: $(shell find olm_deploy -type f) | ||
| .target/cluster-logging-catalog-build: |
There was a problem hiding this comment.
I wonder if we can just remove the dependency on this and the target below. The lower one is already phony, so its dependencies do not really matter anyway ... and I think this one can lose its indirection and be made phony as well.
| # Set variables from environment or hard-coded default | ||
| export OPERATOR_NAME=cluster-logging-operator | ||
| export CURRENT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD;) | ||
| export CURRENT_BRANCH=$(shell git rev-parse --short HEAD 2> /dev/null) |
There was a problem hiding this comment.
this is not CURRENT_BRANCH anymore, maybe make sense to change variable name to CURRENT_REVISION or something like this
|
@alanconway: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
4 participants
Description
Fixed 2 issues, due to files not copied to image build:
/cc @xperimental
/assign @jcantrill