Skip to content

Commit

Permalink
Merge pull request tektoncd#137 from chmouel/openshift-master-fix-che…
Browse files Browse the repository at this point in the history
…ck-images

Fix check-images target
  • Loading branch information
openshift-merge-robot authored Sep 25, 2019
2 parents 54883e2 + 4c0e181 commit efc85f5
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,22 @@ test-e2e: check-images
# Make sure we have all images in the makefile variable or that would be a new
# binary that needs to be added
check-images:
@for cmd in ./cmd/*;do \
found="" ;\
for image in $(CORE_IMAGES) $(CORE_IMAGES_WITH_GIT);do \
if [[ $$image == $$cmd ]];then \
found=1 ;\
fi \
done ;\
test -n $$found || { \
echo "*ERROR*: Could not find $$cmd in the Makefile variables CORE_IMAGES_WITH_GIT CORE_IMAGES" ;\
echo "" ;\
echo "If it it's a new binary that was added upstream, then do the following :" ;\
echo "- Add the binary to openshift/release like this: https://git.io/fj18c" ;\
echo "- Add to the CORE_IMAGES variables in the Makefile" ;\
echo "- Generate the dockerfiles by running 'make generate-dockerfiles'" ;\
echo "- Commit and PR these to 'openshift/release-next' remote/branch and 'openshift/master'" ;\
exit 1 ;\
} && exit 0 ;\
done
@notfound="" ;\
for cmd in ./cmd/*;do \
[[ ! "$(CORE_IMAGES) $(CORE_IMAGES_WITH_GIT)" == *$$cmd* ]] && { \
notfound="$$notfound $$cmd " ;\
} \
done ;\
test -z "$$notfound" || { \
echo "*ERROR*: Could not find $$notfound in the Makefile variables CORE_IMAGES_WITH_GIT CORE_IMAGES" ;\
echo "" ;\
echo "If it it's a new binary that was added upstream, then do the following :" ;\
echo "- Add the binary to openshift/release like this: https://git.io/fj18c" ;\
echo "- Add to the CORE_IMAGES variables in the Makefile" ;\
echo "- Generate the dockerfiles by running 'make generate-dockerfiles'" ;\
echo "- Commit and PR these to 'openshift/release-next' remote/branch and 'openshift/master'" ;\
exit 1 ;\
}
.PHONY: check-images

# Generate Dockerfiles used by ci-operator. The files need to be committed manually.
Expand Down

0 comments on commit efc85f5

Please sign in to comment.