From 7ef4eb00c903c77552649c43ee975a03c36b5d98 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Sun, 10 Oct 2021 17:14:37 +0200
Subject: [PATCH] Align config

---
 .azure-pipelines/templates/integration-jobs.yml | 6 ++++--
 .azure-pipelines/templates/release-jobs.yml     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml
index afdf528..368d43a 100644
--- a/.azure-pipelines/templates/integration-jobs.yml
+++ b/.azure-pipelines/templates/integration-jobs.yml
@@ -5,11 +5,11 @@ jobs:
     steps:
       - script: |
           set -e
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker buildx create --use
           VERSION=`cat VERSION`
           echo "Docker tag is: ${VERSION}"
-          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --tag adferrand/backuppc --output type=local,dest=test .
+          docker buildx build --platform linux/amd64 --tag adferrand/backuppc --load .
+          docker save adferrand/backuppc | gzip -c -1 > $(Build.ArtifactStagingDirectory)/docker-backuppc.tar.gz
         displayName: Build container
       - task: PublishPipelineArtifact@1
         inputs:
@@ -27,6 +27,7 @@ jobs:
           path: $(Build.SourcesDirectory)
         displayName: Retrieve Docker artifact
       - script: |
+          set -e
           docker load < docker-backuppc.tar.gz
           mkdir -p ./bin
           curl -fsSL https://goss.rocks/install | GOSS_DST=./bin sh
@@ -43,6 +44,7 @@ jobs:
           path: $(Build.SourcesDirectory)
         displayName: Retrieve Docker artifact
       - script: |
+          set -e
           docker load < docker-backuppc.tar.gz
           docker run --name backuppc-integration --detach -p 8080:8080 adferrand/backuppc
           sleep 5
diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml
index db566c5..431d3fc 100644
--- a/.azure-pipelines/templates/release-jobs.yml
+++ b/.azure-pipelines/templates/release-jobs.yml
@@ -10,8 +10,6 @@ jobs:
         displayName: Login to DockerHub
       - script: |
           set -e
-          curl -fsSL get.docker.com -o get-docker.sh && sh get-docker.sh
-          export DOCKER_CLI_EXPERIMENTAL=enabled
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker buildx create --use
           VERSION=`cat VERSION`
@@ -29,11 +27,13 @@ jobs:
           addToPath: true
         displayName: Install Python
       - script: |
+          set -e
           VERSION=`cat VERSION`
           echo "Version is: $version"
           echo "##vso[task.setvariable variable=ReleaseVersion;]${VERSION}"
         displayName: Get version
       - script: |
+          set -e
           python utils/extract_changelog.py $(ReleaseVersion) > release_$(ReleaseVersion).md
       - task: GithubRelease@0
         inputs: