From d52ab13b5fa4cb2153787ac87da388b181eeddde Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Mon, 7 Jun 2021 14:46:07 +0200
Subject: [PATCH] Update CI: update ubuntu image, add download test (#8298)

* Update CI: update ubuntu image, add download test

* Switch instances to `ubuntu-18.04`
* Add model download test, currently only for one job with python 3.8

* Fix variable name

* Set variables explicitly
---
 .github/azure-steps.yml | 10 ++++++++++
 azure-pipelines.yml     | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml
index d536f2eb8..21d2654ad 100644
--- a/.github/azure-steps.yml
+++ b/.github/azure-steps.yml
@@ -11,6 +11,10 @@ steps:
       versionSpec: ${{ parameters.python_version }}
       architecture: ${{ parameters.architecture }}
 
+  - bash: |
+      echo "##vso[task.setvariable variable=python_version]${{ parameters.python_version }}"
+    displayName: 'Set variables'
+
   - script: |
       ${{ parameters.prefix }} python -m pip install -U pip setuptools
       ${{ parameters.prefix }} python -m pip install -U -r requirements.txt
@@ -55,3 +59,9 @@ steps:
       ${{ parameters.prefix }} python -m pytest --pyargs spacy -p spacy.tests.enable_gpu
     displayName: "Run GPU tests"
     condition: eq(${{ parameters.gpu }}, true)
+
+  - script: |
+      python -m spacy download en_core_web_sm
+      python -c "import spacy; nlp=spacy.load('en_core_web_sm'); doc=nlp('test')"
+    displayName: 'Test download CLI'
+    condition: eq(variables['python_version'], '3.8')
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5840b916b..7ad1b27b3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ jobs:
   # defined in .flake8 and overwrites the selected codes.
   - job: "Validate"
     pool:
-      vmImage: "ubuntu-16.04"
+      vmImage: "ubuntu-18.04"
     steps:
       - task: UsePythonVersion@0
         inputs:
@@ -38,7 +38,7 @@ jobs:
       matrix:
         # We're only running one platform per Python version to speed up builds
         Python36Linux:
-          imageName: "ubuntu-16.04"
+          imageName: "ubuntu-18.04"
           python.version: "3.6"
         #        Python36Windows:
         #          imageName: "vs2017-win2016"
@@ -47,7 +47,7 @@ jobs:
         #          imageName: "macos-10.14"
         #          python.version: "3.6"
         #        Python37Linux:
-        #          imageName: "ubuntu-16.04"
+        #          imageName: "ubuntu-18.04"
         #          python.version: "3.7"
         Python37Windows:
           imageName: "vs2017-win2016"
@@ -56,7 +56,7 @@ jobs:
         #          imageName: "macos-10.14"
         #          python.version: "3.7"
         #        Python38Linux:
-        #          imageName: "ubuntu-16.04"
+        #          imageName: "ubuntu-18.04"
         #          python.version: "3.8"
         #        Python38Windows:
         #          imageName: "vs2017-win2016"
@@ -65,7 +65,7 @@ jobs:
           imageName: "macos-10.14"
           python.version: "3.8"
         Python39Linux:
-          imageName: "ubuntu-16.04"
+          imageName: "ubuntu-18.04"
           python.version: "3.9"
         Python39Windows:
           imageName: "vs2017-win2016"