From d140408faf0d3ab5452312dd292ceb0ed45ab7d4 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Fri, 26 Jun 2020 21:34:21 +0200
Subject: [PATCH] Configure farm tests

---
 .../templates/jobs/deployment-jobs.yml        |  2 +-
 .../templates/jobs/extended-tests-jobs.yml    | 49 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/.azure-pipelines/templates/jobs/deployment-jobs.yml b/.azure-pipelines/templates/jobs/deployment-jobs.yml
index d6fd7d8c8..69148a3dc 100644
--- a/.azure-pipelines/templates/jobs/deployment-jobs.yml
+++ b/.azure-pipelines/templates/jobs/deployment-jobs.yml
@@ -29,6 +29,6 @@ jobs:
           secureFile: snapcraft.cfg
       - bash: |
           mkdir -p .snapcraft
-          ln -s .snapcraft/snapcraft.cfg $(snapcraftCfg.secureFilePath)
+          ln -s $(snapcraftCfg.secureFilePath) .snapcraft/snapcraft.cfg
           snapcraft push --release=edge snap/*.snap
         displayName: Publish to Snap store
diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 47d35453d..383026523 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -1,11 +1,9 @@
 jobs:
   - job: x_test
     variables:
-      - name: IMAGE_NAME
-        value: ubuntu-18.04
-      - group: certbot-common
-      - ${{ if contains(variables['TOXENV'], 'integration') }}:
-          PYTEST_ADDOPTS: --numprocesses 4
+      IMAGE_NAME: ubuntu-18.04
+      ${{ if contains(variables['TOXENV'], 'integration') }}:
+        PYTEST_ADDOPTS: --numprocesses 4
     strategy:
       matrix:
         linux-py36:
@@ -80,19 +78,36 @@ jobs:
           TOXENV: le_auto_oraclelinux6
         dev:
           TOXENV: docker_dev
-        farmtest-apache2:
-          PYTHON_VERSION: 3.7
-          TOXENV: azure-test-farm-apache2
-        farmtest-leauto-upgrades:
-          PYTHON_VERSION: 3.7
-          TOXENV: azure-test-farm-leauto-upgrades
-        farmtest-certonly-standalone:
-          PYTHON_VERSION: 3.7
-          TOXENV: azure-test-farm-certonly-standalone
-        farmtest-sdists:
-          PYTHON_VERSION: 3.7
-          TOXENV: azure-test-farm-sdists
     pool:
       vmImage: $(IMAGE_NAME)
     steps:
       - template: ../steps/tox-steps.yml
+  - job: farm_test
+    variables:
+      - group: certbot-common
+    strategy:
+      matrix:
+        apache2:
+          TOXENV: azure-test-farm-apache2
+        leauto-upgrades:
+          TOXENV: azure-test-farm-leauto-upgrades
+        certonly-standalone:
+          TOXENV: azure-test-farm-certonly-standalone
+        sdists:
+          TOXENV: azure-test-farm-sdists
+    steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: 3.7
+          addToPath: true
+      - bash: |
+          python tools/pip_install.py -I tox virtualenv
+        displayName: Install runtime dependencies
+      - task: DownloadSecureFile@1
+        name: testFarmPem
+        inputs:
+          secureFile: azure-test-farm.pem
+      - bash: |
+          ln -s $(testFarmPem.secureFilePath) azure-test-farm.pem
+          exit 0
+        displayName: Run tox