ci: DRY_RUN variable is a string not a bool (#601)

Azure · Feb 27, 2019 · 29498d7 · 29498d7
1 parent e80408c
commit 29498d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.pipelines/vhd-builder.yaml b/.pipelines/vhd-builder.yaml
@@ -44,7 +44,7 @@ phases:
       -e VHD_NAME=${VHD_NAME} \
       ${DEIS_GO_DEV_IMAGE} make az-copy
     displayName: Copying resource to Classic Storage Account
-    condition: not(variables.DRY_RUN)
+    condition: eq(variables.DRY_RUN, 'False')
   - script: |
       SA_NAME="$(cat packer-output | grep "storage name:" | cut -d " " -f 3)" && \
       docker run --rm \

diff --git a/packer.mk b/packer.mk
@@ -8,7 +8,7 @@ az-login:
 	az login --service-principal -u ${CLIENT_ID} -p ${CLIENT_SECRET} --tenant ${TENANT_ID}
 
 run-packer: az-login
-	@packer version && $(MAKE) init-packer | tee packer-output && ($(MAKE) build-packer | tee -a packer-output)
+	@packer version && ($(MAKE) init-packer | tee packer-output) && ($(MAKE) build-packer | tee -a packer-output)
 
 az-copy: az-login
 	azcopy --source "${OS_DISK_SAS}" --destination "${CLASSIC_BLOB}/${VHD_NAME}" --dest-sas "${CLASSIC_SAS_TOKEN}"