From 7fa29c657ccf553ba6a6ee230fd063d2d26de794 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Mon, 6 Jul 2020 23:38:37 +0200
Subject: [PATCH] Apply normal config for pipelines

---
 .azure-pipelines/main.yml                     |  3 +--
 .../templates/jobs/packaging-jobs.yml         | 20 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.azure-pipelines/main.yml b/.azure-pipelines/main.yml
index 628db56ac..1975d36db 100644
--- a/.azure-pipelines/main.yml
+++ b/.azure-pipelines/main.yml
@@ -4,5 +4,4 @@ pr:
   - '*.x'
 
 jobs:
-  # TODO: revert to templates/jobs/standard-tests-jobs.yml
-  - template: templates/jobs/packaging-jobs.yml
+  - template: templates/jobs/standard-tests-jobs.yml
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index fe21e8e7a..a3c80c4cd 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -64,11 +64,11 @@ jobs:
         amd64:
           ARCH: amd64
         # Do not run the QEMU jobs for the full-test-suite pipeline
-#        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
-#          arm64:
-#            ARCH: arm64
-#          armhf:
-#            ARCH: armhf
+        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
+          arm64:
+            ARCH: arm64
+          armhf:
+            ARCH: armhf
     pool:
       vmImage: ubuntu-18.04
     steps:
@@ -87,11 +87,11 @@ jobs:
         amd64:
           ARCH: amd64
         # Do not run the QEMU jobs for the full-test-suite pipeline
-#        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
-#          arm64:
-#            ARCH: arm64
-#          armhf:
-#            ARCH: armhf
+        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
+          arm64:
+            ARCH: arm64
+          armhf:
+            ARCH: armhf
     pool:
       vmImage: ubuntu-18.04
     steps: