From c81ecf71c8fcaa08aaa9e581795f14bbc5c88f9a Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Wed, 22 Jul 2020 20:28:45 -0600
Subject: [PATCH] Fix the os match

---
 spack.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index cc21848..2cea529 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -1,9 +1,9 @@
 spack:
   definitions:
   - bootstrapped_compilers:
-    - "llvm@6.0.0 %gcc@7.3.0 os=centos7"
-    - "gcc@7.2.1 %gcc@7.3.0 os=centos7"
-    - "gcc@8.3.0 %gcc@7.3.0 os=centos7"
+    - "llvm@6.0.0 os=centos7"
+    - "gcc@7.2.1 os=centos7"
+    - "gcc@8.3.0 os=centos7"
   - gcc_system_packages:
     - matrix:
       - - zlib
@@ -46,7 +46,8 @@ spack:
 
   gitlab-ci:
     bootstrap:
-      - bootstrapped_compilers
+      - name: bootstrapped_compilers
+        compiler-agnostic: true
     mappings:
     - match: [llvm]
       runner-attributes:
@@ -62,7 +63,7 @@ spack:
           entrypoint: ['']
         tags: [spack-kube, large]
         variables: {}
-    - match: [os=ubuntu18.04]
+    - match: [os=centos7]
       runner-attributes:
         image:
           name: ecpe4s/centos7-runner:1.0