Add more support

azp-template-addon.yml

@@ -1,14 +1,14 @@
 
 parameters:
-  addonFolder: ''
+  addon: ''
-  addonImage: ''
+  arch: ''
 
 steps:
   - script: sudo apt-get install -y jq curl
     displayName: 'Install JQ/curl'
   - script: |
-      tag="$(cat ${{ parameters.addonFolder }}/config.json | jq --raw-output ".version")"
+      tag="$(cat ${{ parameters.addon }}/config.json | jq --raw-output ".version")"
-      metadata="$(curl -s https://hub.docker.com/v2/repositories/homeassistant/$(buildArch)-${{ parameters.addonImage }}/tags/$tag/ | jq --raw-output '.name // empty')"
+      metadata="$(curl -s https://hub.docker.com/v2/repositories/homeassistant/$(buildArch)-addon-${{ parameters.addon }}/tags/$tag/ | jq --raw-output '.name // empty')"
 
       # Version Exists
       echo "$tag - $metadata"
@@ -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 "--$(buildArch)" -t /data/${{ parameters.addonFolder }} \
+        --addon ${{ parameters.arch }} -t /data/${{ parameters.addon }} \
         --docker-hub homeassistant
-    displayName: 'Build ${{ parameters.addonFolder }}'
+    displayName: 'Build ${{ parameters.addon }}'

azure-pipelines.yml

@@ -66,23 +66,64 @@ 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: template-addon.yml
+  - template: azp-template-addon.yml
     parameters:
-      addonFolder: 'cec_scan'
+      addon: 'cec_scan'
-      addonImage: 'addon-cec_scan'
+      arch: '--all'
+
+
+- job: 'check_config'
+  condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('ShellCheck'), succeeded('JQ'))
+  dependsOn:
+  - 'Hadolint'
+  - 'ShellCheck'
+  - 'JQ'
+  timeoutInMinutes: 120
+  pool:
+    vmImage: 'ubuntu-16.04'
+  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'
+  condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('ShellCheck'), succeeded('JQ'))
+  dependsOn:
+  - 'Hadolint'
+  - 'ShellCheck'
+  - 'JQ'
+  timeoutInMinutes: 120
+  pool:
+    vmImage: 'ubuntu-16.04'
+  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'
+  condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('ShellCheck'), succeeded('JQ'))
+  dependsOn:
+  - 'Hadolint'
+  - 'ShellCheck'
+  - 'JQ'
+  timeoutInMinutes: 120
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+    displayName: 'Docker hub login'
+  - template: azp-template-addon.yml
+    parameters:
+      addon: 'deconz'
+      arch: '--armhf --amd64'