From d386aa3e0c37cf8e1c5926163ac0fc20d6b5369e Mon Sep 17 00:00:00 2001
From: AJ Schmidt <aschmidt@nvidia.com>
Date: Mon, 26 Apr 2021 09:32:50 -0400
Subject: [PATCH] update axes

---
 ci/axis/nightly.yaml | 13 -------------
 ci/axis/release.yaml |  8 +-------
 ci/axis/tests.yaml   |  7 ++++---
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml
index 76ad9700..fe54b357 100644
--- a/ci/axis/nightly.yaml
+++ b/ci/axis/nightly.yaml
@@ -6,26 +6,13 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
 RAPIDS_VER:
-  - 0.19.0a
   - 0.20.0a
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
   - 11.2
   - 11.0
-  - 10.2
-  - 10.1
-
-# TODO: DEPRECATED - No longer used and needs to be removed & gpuCI jobs updated
-DEFAULT_CUDA_VER:
-  - 10.1
 
 PYTHON_VER:
   - 3.7
   - 3.8
-
-exclude:
-  - RAPIDS_VER: 0.20.0a
-    CUDA_VER: 10.1
-  - RAPIDS_VER: 0.20.0a
-    CUDA_VER: 10.2
diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml
index 54cbc2f5..6477c4b2 100644
--- a/ci/axis/release.yaml
+++ b/ci/axis/release.yaml
@@ -6,18 +6,12 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Y (major.minor.patch) version to match tag
 RAPIDS_VER:
-  - 0.19.0
+  - '0.20.0'
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
   - 11.2
   - 11.0
-  - 10.2
-  - 10.1
-
-# TODO: DEPRECATED - No longer used and needs to be removed & gpuCI jobs updated
-DEFAULT_CUDA_VER:
-  - 10.1
 
 PYTHON_VER:
   - 3.7
diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml
index fff843da..defbe2bd 100644
--- a/ci/axis/tests.yaml
+++ b/ci/axis/tests.yaml
@@ -6,17 +6,18 @@ DOCKER_REPO:
 
 # Use M.X (major.minor) version
 RAPIDS_VER:
-  - 0.19
+  - '0.20'
 
 CUDA_VER:
+  - 11.2
   - 11.0
-  - 10.2
-  - 10.1
 
 LINUX_VER:
   - ubuntu16.04
   - ubuntu18.04
+  - ubuntu20.04
   - centos7
+  - centos8
 
 PYTHON_VER:
   - 3.7