From 03d065a46d3d395753ba25d69168e7a035f2ccc9 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 24 Apr 2019 19:34:06 +0200
Subject: [PATCH] Fix arch

---
 azp-template-addon.yml |  2 +-
 azure-pipelines.yml    | 50 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/azp-template-addon.yml b/azp-template-addon.yml
index f5acb91..92b76f1 100644
--- a/azp-template-addon.yml
+++ b/azp-template-addon.yml
@@ -24,6 +24,6 @@ steps:
         -v ~/.docker:/root/.docker \
         -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
         homeassistant/amd64-builder:$(versionBuilder) \
-        --addon ${{ parameters.arch }} -t /data/${{ parameters.addon }} \
+        --addon "--$(buildArch)" -t /data/${{ parameters.addon }} \
         --docker-hub homeassistant
     displayName: 'Build ${{ parameters.addon }}'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0cc4af3..1e6fee7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -66,13 +66,25 @@ jobs:
   timeoutInMinutes: 120
   pool:
     vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 3
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
   steps:
   - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
     displayName: 'Docker hub login'
   - template: azp-template-addon.yml
     parameters:
       addon: 'cec_scan'
-      arch: '--all'
 
 
 - job: 'check_config'
@@ -84,13 +96,25 @@ jobs:
   timeoutInMinutes: 120
   pool:
     vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 3
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
   steps:
   - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
     displayName: 'Docker hub login'
   - template: azp-template-addon.yml
     parameters:
       addon: 'check_config'
-      arch: '--all'
 
 
 - job: 'configurator'
@@ -102,13 +126,25 @@ jobs:
   timeoutInMinutes: 120
   pool:
     vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 3
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
   steps:
   - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
     displayName: 'Docker hub login'
   - template: azp-template-addon.yml
     parameters:
       addon: 'configurator'
-      arch: '--all'
 
 
 - job: 'deconz'
@@ -120,10 +156,16 @@ jobs:
   timeoutInMinutes: 120
   pool:
     vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 1
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      armhf:
+        buildArch: 'armhf'
   steps:
   - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
     displayName: 'Docker hub login'
   - template: azp-template-addon.yml
     parameters:
       addon: 'deconz'
-      arch: '--armhf --amd64'