From e3db140ef51297361891fda4c7af1e980119b726 Mon Sep 17 00:00:00 2001
From: Steve Garon <steve.garon@cyber.gc.ca>
Date: Wed, 28 Jul 2021 13:17:44 +0000
Subject: [PATCH 1/2] Use python 3.9

---
 pipelines/azure-build.yaml | 13 +++----------
 pipelines/azure-test.yaml  |  8 ++++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
index 964a7775..dc24a978 100644
--- a/pipelines/azure-build.yaml
+++ b/pipelines/azure-build.yaml
@@ -37,7 +37,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs: { versionSpec: 3.8 }
+            inputs: { versionSpec: 3.9 }
           - script: |
               export VERSION=${BUILD_SOURCEBRANCH#"refs/tags/v"}
               export COMMIT=`git rev-parse --verify ${BUILD_SOURCEBRANCH}`
@@ -59,12 +59,6 @@ stages:
   - stage: test
     jobs:
       - job: run_test
-        strategy:
-          matrix:
-            python3_7:
-              python.version: "3.7"
-            Python3_8:
-              python.version: "3.8"
         timeoutInMinutes: 10
         services:
           elasticsearch: elasticsearch
@@ -74,8 +68,7 @@ stages:
           - checkout: none
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs:
-              versionSpec: "$(python.version)"
+            inputs: { versionSpec: 3.9 }
           - download: current
             artifact: dist
           - download: current
@@ -120,7 +113,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs: { versionSpec: 3.8 }
+            inputs: { versionSpec: 3.9 }
           - download: current
             artifact: dist
           - script: |
diff --git a/pipelines/azure-test.yaml b/pipelines/azure-test.yaml
index 371f239b..fa60e525 100644
--- a/pipelines/azure-test.yaml
+++ b/pipelines/azure-test.yaml
@@ -41,10 +41,10 @@ jobs:
   - job: run_test
     strategy:
       matrix:
-        python3_7:
-          python.version: "3.7"
-        Python3_8:
-          python.version: "3.8"
+        python3_9:
+          python.version: "3.9"
+        # Python3_10:
+        #   python.version: "3.10"
 
     timeoutInMinutes: 15
     services:

From 404dba9d13473f8c3b93f22f0c41657aae53bcb1 Mon Sep 17 00:00:00 2001
From: Steve Garon <steve.garon@cyber.gc.ca>
Date: Wed, 28 Jul 2021 13:38:02 +0000
Subject: [PATCH 2/2] Use newer VM for testing

---
 pipelines/azure-build.yaml | 2 +-
 pipelines/azure-test.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
index dc24a978..17183d7b 100644
--- a/pipelines/azure-build.yaml
+++ b/pipelines/azure-build.yaml
@@ -6,7 +6,7 @@ trigger:
 pr: none
 
 pool:
-  vmImage: "ubuntu-18.04"
+  vmImage: "ubuntu-20.04"
 
 resources:
   containers:
diff --git a/pipelines/azure-test.yaml b/pipelines/azure-test.yaml
index fa60e525..89d8cac5 100644
--- a/pipelines/azure-test.yaml
+++ b/pipelines/azure-test.yaml
@@ -4,7 +4,7 @@ trigger: ["*"]
 pr: ["*"]
 
 pool:
-  vmImage: "ubuntu-18.04"
+  vmImage: "ubuntu-20.04"
 
 resources:
   containers: