From ffc5886cabf121646f824f5aee955da1348ccfbb Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 7 May 2020 15:47:12 +0200 Subject: [PATCH] First round --- .azure/azp-template-addon.yml | 26 -------------------------- ada/azure-pipelines.yml | 15 +++++++++++---- almond/azure-pipelines.yml | 15 +++++++++++---- cec_scan/azure-pipelines.yml | 11 +++++++---- check_config/azure-pipelines.yml | 11 +++++++---- configurator/azure-pipelines.yml | 11 +++++++---- deconz/azure-pipelines.yml | 15 +++++++++++---- zwave/azure-pipelines.yml | 11 +++++++---- 8 files changed, 61 insertions(+), 54 deletions(-) delete mode 100644 .azure/azp-template-addon.yml diff --git a/.azure/azp-template-addon.yml b/.azure/azp-template-addon.yml deleted file mode 100644 index 099a693..0000000 --- a/.azure/azp-template-addon.yml +++ /dev/null @@ -1,26 +0,0 @@ -# This azure pipeline template build add-ons - -parameters: - addon: '' - arch: '' - -jobs: - -- job: '${{ parameters.addon }}' - condition: eq(variables['Build.SourceBranchName'], 'master') - pool: - vmImage: 'ubuntu-latest' - timeoutInMinutes: 360 - steps: - - script: sudo docker login -u $(dockerUser) -p $(dockerPassword) - displayName: 'Docker hub login' - - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder) - displayName: 'Install Builder' - - script: | - sudo docker run --rm --privileged \ - -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 }} \ - --docker-hub homeassistant --docker-hub-check - displayName: 'Build ${{ parameters.addon }}' diff --git a/ada/azure-pipelines.yml b/ada/azure-pipelines.yml index 129e8d0..150db41 100644 --- a/ada/azure-pipelines.yml +++ b/ada/azure-pipelines.yml @@ -8,14 +8,21 @@ trigger: include: - ada/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "ada" - arch: "--amd64 --armv7 --armhf" + arch: + - amd64 + - armv7 + - armhf diff --git a/almond/azure-pipelines.yml b/almond/azure-pipelines.yml index f69bdc7..3b6b989 100644 --- a/almond/azure-pipelines.yml +++ b/almond/azure-pipelines.yml @@ -8,14 +8,21 @@ trigger: include: - almond/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "almond" - arch: "--amd64 --armv7 --aarch64" + arch: + - amd64 + - armv7 + - aarch64 diff --git a/cec_scan/azure-pipelines.yml b/cec_scan/azure-pipelines.yml index c62f407..38ade2d 100644 --- a/cec_scan/azure-pipelines.yml +++ b/cec_scan/azure-pipelines.yml @@ -8,14 +8,17 @@ trigger: include: - cec_scan/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "cec_scan" - arch: "--all" diff --git a/check_config/azure-pipelines.yml b/check_config/azure-pipelines.yml index 7837b4a..c7a24ca 100644 --- a/check_config/azure-pipelines.yml +++ b/check_config/azure-pipelines.yml @@ -8,14 +8,17 @@ trigger: include: - check_config/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "check_config" - arch: "--all" diff --git a/configurator/azure-pipelines.yml b/configurator/azure-pipelines.yml index f5ab8a5..3e8d2f6 100644 --- a/configurator/azure-pipelines.yml +++ b/configurator/azure-pipelines.yml @@ -8,14 +8,17 @@ trigger: include: - configurator/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "configurator" - arch: "--all" diff --git a/deconz/azure-pipelines.yml b/deconz/azure-pipelines.yml index 14a43f2..0ab08de 100644 --- a/deconz/azure-pipelines.yml +++ b/deconz/azure-pipelines.yml @@ -8,14 +8,21 @@ trigger: include: - deconz/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "deconz" - arch: "--armhf --amd64 --aarch64" + arch: + - armhf + - amd64 + - aarch64 diff --git a/zwave/azure-pipelines.yml b/zwave/azure-pipelines.yml index a177747..243183c 100644 --- a/zwave/azure-pipelines.yml +++ b/zwave/azure-pipelines.yml @@ -8,14 +8,17 @@ trigger: include: - zwave/* pr: none +resources: + repositories: + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" variables: - - name: versionBuilder - value: "2.0" - group: docker jobs: - - template: /.azure/azp-template-addon.yml + - template: templates/azp-job-version.yaml@azure parameters: addon: "zwave" - arch: "--all"