From 3955955b37f1d9240d0c0263880a7e3981e5d779 Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Fri, 11 Dec 2020 13:54:14 +0000
Subject: [PATCH] Remove PATH hack (#44)

* Remove PATH hack

azure-pipelines-test-container:1.7.1 contains a proper fix for ensuring
PATH contains the location of pip installed binaries so we can remove
the hack.

* Correct RHEL groups
---
 .azure-pipelines/azure-pipelines.yml | 17 ++++++++++-------
 tests/utils/shippable/shippable.sh   |  3 ---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index f1a46e27..0575f5df 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -36,7 +36,7 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.7.0
+      image: quay.io/ansible/azure-pipelines-test-container:1.7.1
 
 pool: Standard
 
@@ -183,10 +183,10 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          nameFormat: RHEL 8.2 {0}
-          testFormat: 2.10/rhel/8.2/{0}
+          nameFormat: RHEL {0}
+          testFormat: devel/rhel/{0}
           targets:
-            - test: ''
+            - test: '8.2'
           groups:
             - 1
             - 2
@@ -197,14 +197,17 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          nameFormat: RHEL 8.2 {0}
-          testFormat: 2.9/rhel/8.2/{0}
+          nameFormat: RHEL {0}
+          testFormat: devel/rhel/{0}
           targets:
-            - test: ''
+            - test: '8.2'
           groups:
             - 1
             - 2
             - 3
+
+  ## Finally
+
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 97a0651b..e9318cdd 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -14,9 +14,6 @@ function join {
     echo "$*";
 }
 
-# HACK remove once azure-pipelines-test-container has been fixed
-export PATH=$PATH:$HOME/.local/bin
-
 # Ensure we can write other collections to this dir
 sudo chown "$(whoami)" "${PWD}/../../"