From 04f976d7d35b665c865b2e7d9e465954316eab85 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 15 Feb 2021 16:14:20 +0530
Subject: [PATCH] Update OS as per guidelines

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
---
 .azure-pipelines/azure-pipelines.yml | 30 +++++++++++++++-------------
 tests/utils/shippable/macos.sh       |  1 +
 2 files changed, 17 insertions(+), 14 deletions(-)
 create mode 120000 tests/utils/shippable/macos.sh

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 8ad8b8d..a51b162 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -57,18 +57,18 @@ stages:
               test: centos7
             - name: CentOS 8
               test: centos8
-            - name: Fedora 30
-              test: fedora30
-            - name: Fedora 31
-              test: fedora31
+            - name: Fedora 32
+              test: fedora32
+            - name: Fedora 33
+              test: fedora33
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
               test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
             - name: Ubuntu 18.04
               test: ubuntu1804
+            - name: Ubuntu 20.04
+              test: ubuntu2004
   - stage: Docker_2_10
     displayName: Docker 2.10
     dependsOn: []
@@ -131,14 +131,16 @@ stages:
         parameters:
           testFormat: devel/{0}/1
           targets:
-            - name: OS X 10.11
-              test: osx/10.11
-            - name: RHEL 7.6
-              test: rhel/7.6
-            - name: RHEL 8.1
-              test: rhel/8.1
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
+            - name: MacOS 11.1
+              test: macos/11.1
+            - name: RHEL 7.9
+              test: rhel/7.9
+            - name: RHEL 8.3
+              test: rhel/8.3
+            - name: FreeBSD 11.4
+              test: freebsd/11.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
             - name: FreeBSD 12.1
               test: freebsd/12.1
   - stage: Remote_2_10
diff --git a/tests/utils/shippable/macos.sh b/tests/utils/shippable/macos.sh
new file mode 120000
index 0000000..6ddb776
--- /dev/null
+++ b/tests/utils/shippable/macos.sh
@@ -0,0 +1 @@
+remote.sh
\ No newline at end of file