ci: use igwn/{base,builder} selectively for RHEL

only use builder for build jobs, use base for testing, currently use base for building on el9, until docker/builder#2 is complete

.gitlab/ci/rhel.yml

@@ -18,15 +18,29 @@ include:
 
 .el7:
   extends: .el
+  image: igwn/base:el7-testing
+
+.el7-build:
+  extends: .el7
   image: igwn/builder:el7-testing
 
 .el8:
   extends: .el
+  image: igwn/base:el8-testing
+
+.el8-build:
+  extends: .el8
   image: igwn/builder:el8-testing
 
 .el9:
   extends: .el
-  image: igwn/builder:el9-testing
+  image: igwn/base:el9-testing
+
+.el9-build:
+  extends: .el9
+  # no igwn/builder for el9 yet,
+  # see https://git.ligo.org/docker/builder/-/issues/2
+  image: igwn/base:el9-testing
 
 # -- source packages --------
 #
@@ -63,17 +77,17 @@ include:
 srpm:el7:
   extends:
     - .srpm
-    - .el7
+    - .el7-build
 
 srpm:el8:
   extends:
     - .srpm
-    - .el8
+    - .el8-build
 
 srpm:el9:
   extends:
     - .srpm
-    - .el9
+    - .el9-build
 
 # -- binary packages --------
 #
@@ -92,21 +106,21 @@ srpm:el9:
 rpm:el7:
   extends:
     - .rpm
-    - .el7
+    - .el7-build
   needs:
     - srpm:el7
 
 rpm:el8:
   extends:
     - .rpm
-    - .el8
+    - .el8-build
   needs:
     - srpm:el8
 
 rpm:el9:
   extends:
     - .rpm
-    - .el9
+    - .el9-build
   needs:
     - srpm:el9
 
@@ -142,7 +156,6 @@ test:el7:
   needs:
     - tarball
     - rpm:el7
-  image: igwn/base:el7-testing
 
 # -- EL8 has python3-flask < 1.0.0
 #test:el8:
@@ -152,7 +165,6 @@ test:el7:
 #  needs:
 #    - tarball
 #    - rpm:el8
-#  image: igwn/base:el8-testing
 
 test:el9:
   extends:
@@ -161,7 +173,6 @@ test:el9:
   needs:
     - tarball
     - rpm:el9
-  image: igwn/base:el9-testing
 
 # -- lint -------------------
 #