Merge pull request #144 from pradipd/pipelines-fix

Fixing release pipeline

Author: pradipd

Makefile

@@ -268,7 +268,7 @@ set-manifest-pull-policy:
 ## --------------------------------------
 
 #RELEASE_TAG := $(shell git describe --abbrev=0 2>/dev/null)
-RELEASE_TAG := $(TAG)
+RELEASE_TAG ?= $(TAG)
 RELEASE_DIR := out
 
 $(RELEASE_DIR):

azure-pipelines-release.yml

@@ -38,10 +38,10 @@ steps:
       exit 1
     fi
 
-    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller PATCH_VER=$(RELEASE_TAG) docker-build docker-push
-    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller PATCH_VER=$(RELEASE_TAG) release
-    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller PATCH_VER=$(RELEASE_TAG) generate-flavors
-    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller PATCH_VER=$(RELEASE_TAG) release-pipelines
+    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller RELEASE_TAG=$(RELEASE_TAG) docker-build docker-push
+    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller RELEASE_TAG=$(RELEASE_TAG) release
+    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller RELEASE_TAG=$(RELEASE_TAG) generate-flavors
+    make REGISTRY=ecpacr.azurecr.io IMAGE_NAME=caphcontroller RELEASE_TAG=$(RELEASE_TAG) release-pipelines
   workingDirectory: '$(System.DefaultWorkingDirectory)'
   displayName: 'Build CAPH'