From 8d763979264872d65803b02ed1773a3a02190984 Mon Sep 17 00:00:00 2001
From: eiximenis <etomas@gmail.com>
Date: Thu, 6 Jun 2019 12:34:27 +0200
Subject: [PATCH] test build

---
 build/azure-devops/buildimages.yaml |  6 +++---
 build/azure-devops/multiarch.yaml   | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml
index 50ed1bb6f..a4d9b505c 100644
--- a/build/azure-devops/buildimages.yaml
+++ b/build/azure-devops/buildimages.yaml
@@ -52,11 +52,11 @@ jobs:
         TAG=${{ variables['Build.SourceBranchName'] }} 
   - task: CopyFiles@2
     inputs:
-      sourceFolder: ${{ variables['Build.SourcesDirectory'] }}/k8s/helm    
-      targetFolder: ${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm
+      sourceFolder: '${{ variables['Build.SourcesDirectory'] }}/k8s/helm'
+      targetFolder: '${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm'
   - task: PublishBuildArtifacts@1
     inputs:
-      pathtoPublish: ${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm
+      pathtoPublish: '${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm'
       artifactName: helm
 - job: BuildWindows
   condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index 252bc8833..2fe52ac49 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -15,16 +15,15 @@ jobs:
       command: login
       containerregistrytype: 'Container Registry'
       dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-  - task: Bash@3
+  - bash: |
+      mkdir -p ~/.docker
+      echo '{ "experimental": "enabled" }' > ~/.docker/config.json
+      docker --config ~/.docker manifest create eshop/${{ parameters.image }}:${{ parameters.branch }} eshop/${{ parameters.image }}:linux-${{ parameters.branch }} eshop/${{ parameters.image }}:win-${{ parameters.branch }}
+      docker --config ~/.docker manifest create eshop/${{ parameters.image }}:latest eshop/${{ parameters.image }}:linux-latest eshop/${{ parameters.image }}:win-latest
+      docker --config ~/.docker push eshop/${{ parameters.image }}:${{ parameters.branch }}
+      docker --config ~/.docker push eshop/${{ parameters.image }}:latest
     displayName: Create multiarch manifest
-    inputs:
-      script: |
-        mkdir -p ~/.docker
-        echo '{ "experimental": "enabled" }' > ~/.docker/config.json
-        docker --config ~/.docker manifest create eshop/${{ parameters.image }}:${{ parameters.branch }} eshop/${{ parameters.image }}:linux-${{ parameters.branch }} eshop/${{ parameters.image }}:win-${{ parameters.branch }}
-        docker --config ~/.docker manifest create eshop/${{ parameters.image }}:latest eshop/${{ parameters.image }}:linux-latest eshop/${{ parameters.image }}:win-latest
-        docker --config ~/.docker push eshop/${{ parameters.image }}:${{ parameters.branch }}
-        docker --config ~/.docker push eshop/${{ parameters.image }}:latest
   dependsOn:
     - BuildWindows
     - BuildLinux
+  conditions: succeeded()