From 88f4664c652c3523a248239ba90a256181815f2b Mon Sep 17 00:00:00 2001
From: jofleish <jofleish@microsoft.com>
Date: Mon, 15 Aug 2022 09:11:20 -0400
Subject: [PATCH] Standardize ubutu-latest vmImage

---
 azure-pipelines.yml      | 6 +++---
 scripts/jsdoctest.yml    | 2 +-
 scripts/mk_nuget_task.py | 3 ++-
 scripts/nightly.yaml     | 6 +++---
 scripts/release.yml      | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d29a3dd51..f338a5d98 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,7 +21,7 @@ jobs:
 - job: "LinuxPythonDebug"
   displayName: "Ubuntu build - python make - debug"
   pool:
-    vmImage: "Ubuntu-latest"
+    vmImage: "ubuntu-latest"
   strategy:
     matrix:
       MT:
@@ -102,7 +102,7 @@ jobs:
   displayName: "Ubuntu build - cmake"
   condition: eq(0,1) 
   pool:
-    vmImage: "Ubuntu-latest"
+    vmImage: "ubuntu-latest"
   strategy:
     matrix:
       msanClang:
@@ -135,7 +135,7 @@ jobs:
 - job: "UbuntuCMake"
   displayName: "Ubuntu build - cmake"
   pool:
-    vmImage: "Ubuntu-latest"
+    vmImage: "ubuntu-latest"
   strategy:
     matrix:
       releaseClang:
diff --git a/scripts/jsdoctest.yml b/scripts/jsdoctest.yml
index 1a3a5286f..0556a6cf5 100644
--- a/scripts/jsdoctest.yml
+++ b/scripts/jsdoctest.yml
@@ -12,7 +12,7 @@ stages:
   - job: UbuntuDoc
     displayName: "Ubuntu Doc build"
     pool:
-      vmImage: "Ubuntu-latest"
+      vmImage: "ubuntu-latest"
     steps:
 # TODO setup emscripten with no-install, then run
     - script: npm --prefix=src/api/js ci
diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 75d26a1c5..dd81349df 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -21,7 +21,8 @@ def mk_dir(d):
     if not os.path.exists(d):
         os.makedirs(d)
 
-os_info = {  'ubuntu-18' : ('so', 'linux-x64'),
+os_info = {  'ubuntu-latest' : ('so', 'linux-x64'),
+             'ubuntu-18' : ('so', 'linux-x64'),
              'ubuntu-20' : ('so', 'linux-x64'),
              'glibc-2.31' : ('so', 'linux-x64'),
              'x64-win' : ('dll', 'win-x64'),
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 33bed5b55..98a378e59 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -55,7 +55,7 @@ stages:
   - job: UbuntuDoc
     displayName: "Ubuntu Doc build"
     pool:
-      vmImage: "Ubuntu-latest"
+      vmImage: "ubuntu-latest"
     steps:
     - script: sudo apt-get install ocaml opam libgmp-dev
     - script: opam init -y
@@ -92,7 +92,7 @@ stages:
       name: ManyLinux
     displayName: "ManyLinux build"
     pool:
-      vmImage: "Ubuntu-18.04"
+      vmImage: "ubuntu-latest"
     container: "quay.io/pypa/manylinux2010_x86_64:latest"
     steps:
     - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava
@@ -111,7 +111,7 @@ stages:
 #      name: MuslLinux
 #    displayName: "MuslLinux build"
 #    pool:
-#      vmImage: "Ubuntu-18.04"
+#      vmImage: "ubuntu-latest"
 #    container: "quay.io/pypa/musllinux_1_1_x86_64:latest"
 #    steps:
 #    - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava
diff --git a/scripts/release.yml b/scripts/release.yml
index f305e7c74..969e3697e 100644
--- a/scripts/release.yml
+++ b/scripts/release.yml
@@ -91,7 +91,7 @@ stages:
   - job: UbuntuDoc
     displayName: "Ubuntu Doc build"
     pool:
-      vmImage: "Ubuntu-latest"
+      vmImage: "ubuntu-latest"
     steps:
     - script: sudo apt-get install ocaml opam libgmp-dev
     - script: opam init -y