Skip to content

Commit

Permalink
chore: fix e2e ci build on release branch (argoproj#1161)
Browse files Browse the repository at this point in the history
* chore: fix e2e ci build in release branch

Signed-off-by: Derek Wang <[email protected]>
  • Loading branch information
whynowy authored Apr 5, 2021
1 parent 08b5961 commit b97a84d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GIT_TREE_STATE=$(shell if [ -z "`git status --porcelain`" ]; then echo "clean" ;
DOCKER_PUSH?=false
IMAGE_NAMESPACE?=argoproj
VERSION?=latest
BASE_VERSION:=latest

override LDFLAGS += \
-X ${PACKAGE}.version=${VERSION} \
Expand Down Expand Up @@ -210,7 +211,7 @@ docs/assets/diagram.png: go-diagrams/diagram.dot
.PHONY: start
start: all-images
kubectl apply -f test/manifests/argo-events-ns.yaml
kustomize build test/manifests | sed 's@argoproj/@$(IMAGE_NAMESPACE)/@' | sed 's/:latest/:$(VERSION)/' | kubectl -n argo-events apply -l app.kubernetes.io/part-of=argo-events --prune --force -f -
kustomize build test/manifests | sed 's@argoproj/@$(IMAGE_NAMESPACE)/@' | sed 's/:$(BASE_VERSION)/:$(VERSION)/' | kubectl -n argo-events apply -l app.kubernetes.io/part-of=argo-events --prune --force -f -
kubectl -n argo-events wait --for=condition=Ready --timeout 60s pod --all

$(GOPATH)/bin/golangci-lint:
Expand Down Expand Up @@ -270,6 +271,6 @@ update-manifests-version:
mv /tmp/base_kustomization.yaml manifests/base/kustomization.yaml
cat manifests/extensions/validating-webhook/kustomization.yaml | sed 's/newTag: .*/newTag: $(VERSION)/' > /tmp/wh_kustomization.yaml
mv /tmp/wh_kustomization.yaml manifests/extensions/validating-webhook/kustomization.yaml
cat Makefile | sed 's/^VERSION?=.*/VERSION?=$(VERSION)/' > /tmp/ae_makefile
cat Makefile | sed 's/^VERSION?=.*/VERSION?=$(VERSION)/' | sed 's/^BASE_VERSION:=.*/BASE_VERSION:=$(VERSION)/' > /tmp/ae_makefile
mv /tmp/ae_makefile Makefile

0 comments on commit b97a84d

Please sign in to comment.