.gitlab-ci.yml: move i686 to a separate image

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 590937fbb5afa32607fc765c36b8109272c249aa..f327d40fe232ada16dbba990db4f45e327eabc34 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ variables:
   FEDORA_BUILD: buildenv-fedora42
   FEDORA_DOC_BUILD: buildenv-doc-fedora42
   FEDORA_CROSS_BUILD: buildenv-cross-fedora42
+  FEDORA_I686_BUILD: buildenv-i686-fedora42
   MINGW_BUILD: buildenv-mingw-fedora42
   ALPINE_BASE_BUILD: buildenv-alpine-base
   COMPILER: gcc
@@ -94,6 +95,9 @@ default:
 .fedora-cross:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_CROSS_BUILD
 
+.fedora-i686:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_I686_BUILD
+
 .fedora-nettle:
   extends:
     - .fedora
@@ -661,12 +665,14 @@ fedora-cross/s390x-linux-gnu/test:
   timeout: 2h
   allow_failure: true
 
-fedora-cross/i686-linux-gnu/build:
+fedora-i686/build:
   extends:
     - .build
-    - .fedora
+    - .fedora-i686
   needs:
     - fedora/bootstrap
+  variables:
+    PKG_CONFIG: i686-redhat-linux-gnu-pkg-config
   script:
     # Fedora's softhsm package is not multiarch yet. Missing softhsm libraries
     # for the target will cause the test suite to fail when p11-kit is enabled.
@@ -679,14 +685,14 @@ fedora-cross/i686-linux-gnu/build:
     - setarch i686 -- make -j$BUILDJOBS -C tests check TESTS=""
   when: manual
 
-fedora-cross/i686-linux-gnu/test:
+fedora-i686/test:
   extends:
     - .test
-    - .fedora
+    - .fedora-i686
   dependencies:
-    - fedora-cross/i686-linux-gnu/build
+    - fedora-i686/build
   needs:
-    - fedora-cross/i686-linux-gnu/build
+    - fedora-i686/build
   script:
     - setarch i686 -- make -j$CHECKJOBS check