switch to matrix for better maintainability (#47)

.azure-pipelines/addon-job.yml

@@ -0,0 +1,18 @@
+parameters:
+    jobName:
+    addon: 
+    arch: '--armhf --amd64 --aarch64'
+    poolVmImage: 'ubuntu-16.04'
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    displayName: ${{ parameters.addon }} 
+    pool:
+      vmImage: ${{ parameters.poolVmImage }}
+    steps:
+    - template: addon-template.yml
+      parameters:
+        addon: ${{ parameters.addon }}
+        arch: ${{ parameters.arch }}
+        ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+          additionalArgs: --test

.azure-pipelines/job-matrix.yml

@@ -0,0 +1,7 @@
+jobs:
+  - ${{ each entry in parameters.matrix }}:
+    - template: addon-job.yml
+      parameters:
+        addon: ${{ entry.addon }}
+        arch: ${{ entry.arch }}
+        name: ${{ entry.jobName }}

azure-pipelines.yml

@@ -7,9 +7,10 @@ variables:
   versionHadolint: 'v1.16.3'
   versionBuilder: 'latest'
 
-jobs:
+stages:
-
+  - stage: lint
-- job: 'Hadolint'
+    jobs:
+      - job: 'Hadolint'
         pool:
           vmImage: 'ubuntu-16.04'
         steps:
@@ -27,7 +28,7 @@ jobs:
             done
           displayName: 'Run Hadolint'
 
-- job: 'JQ'
+      - job: 'JQ'
         pool:
           vmImage: 'ubuntu-16.04'
         steps:
@@ -37,168 +38,42 @@ jobs:
             shopt -s globstar
             cat **/*.json | jq '.'
           displayName: 'Run JQ'
-
+  - stage: build
-- job: 'znc'
+    dependsOn: lint
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
+    jobs:
-  dependsOn:
+      - template: .azure-pipelines/job-matrix.yml
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
         parameters:
-      addon: 'znc'
+          matrix:
+            - addon: znc
+              jobName: znc
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: hydra2
-        additionalArgs: --test
+              jobName: hydra2
-
-- job: 'hydra2'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'hydra2'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: nzbget
-        additionalArgs: --test
+              jobName: nzbget
-
-- job: 'nzbget'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'nzbget'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: sonarr
-        additionalArgs: --test
+              jobName: sonarr
-
-- job: 'sonarr'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'sonarr'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: radarr
-        additionalArgs: --test
+              jobName: radarr
-
-- job: 'radarr'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'radarr'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: emby
-        additionalArgs: --test
+              jobName: emby
-
-- job: 'emby'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'emby'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: jellyfin
-        additionalArgs: --test
+              jobName: jellyfin
-
-- job: 'jellyfin'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'jellyfin'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: jackett
-        additionalArgs: --test
+              jobName: jackett
-
+              arch: '--armhf --amd64 --aarch64'
-- job: 'transmission_openvpn'
+            - addon: transmission-openvpn
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
+              jobName: transmission_openvpn
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'transmission-openvpn'
               arch: '--amd64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: transmission-magnet-redirect
-        additionalArgs: --test
+              jobName: transmission_magnet_redirect
-
-- job: 'jackett'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'jackett'
-      arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
-        additionalArgs: --test
-
-- job: 'transmission_magnet_redirect'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'transmission-magnet-redirect'
               arch: '--amd64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
+            - addon: hyperion
-        additionalArgs: --test
+              jobName: hyperion
-
-- job: 'hyperion'
-  condition: and(succeeded('Hadolint'), succeeded('JQ'))
-  dependsOn:
-  - 'Hadolint'
-  - 'JQ'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - template: .azure-pipelines/addon-template.yml
-    parameters:
-      addon: 'hyperion'
               arch: '--armhf --amd64 --aarch64'
-      ${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
-        additionalArgs: --test