Skip to content

Commit

Permalink
Fix duplicate release-prereqs targets
Browse files Browse the repository at this point in the history
  • Loading branch information
caseydavenport committed Jul 13, 2018
1 parent ef0d8c3 commit faa299c
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -466,20 +466,10 @@ release-publish-latest: release-prereqs

$(MAKE) push RELEASE=true IMAGETAG=latest ARCH=$(ARCH)

# release-prereqs checks that the environment is configured properly to create a release.
release-prereqs:
ifndef VERSION
$(error VERSION is undefined - run using make release VERSION=vX.Y.Z)
endif

###############################################################################
# Release
###############################################################################

.PHONY: node-test-at
# Run calico/node docker-image acceptance tests
node-test-at: release-prereq
docker run -v $(CALICO_NODE_DIR)tests/at/calico_node_goss.yaml:/tmp/goss.yaml \
node-test-at: release-prereqs
docker run -v $(PWD)/tests/at/calico_node_goss.yaml:/tmp/goss.yaml \
calico/node:$(VERSION) /bin/sh -c 'apk --no-cache add wget ca-certificates && \
wget -q -O /tmp/goss \
https://github.com/aelsabbahy/goss/releases/download/v0.3.4/goss-linux-amd64 && \
Expand Down

0 comments on commit faa299c

Please sign in to comment.