From bc74431c7a6d19a39b091355e2cf92d42ab305fb Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 5 Sep 2016 09:57:24 +0200
Subject: [PATCH] Use gitlab.com's shared runners

That is, phase out our specific runners to reduce administrative
burden, and rely on gitlab.com shared infrastructure.

http://docs.gitlab.com/ce/ci/runners/README.html
---
 .gitlab-ci.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eafe0d6c..f8394163 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,27 @@
+image: centos:7
+
+before_script:
+ - yum install -y git make autoconf libtool automake gettext-devel glibc-devel gcc valgrind libasan-static libgcc.i686 glibc-devel.i686
+
 # See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
 Build and Check (x86-64):
   script:
+  - yum install -y gmp-devel
   - ./.bootstrap &&
     ./configure --disable-documentation && make -j4 &&
     make check -j4
   tags:
-  - x86-64
+  - shared
   except:
   - tags
 Build and Check (x86):
   script:
+  - yum install -y gmp-devel.i686
   - ./.bootstrap &&
-    ./configure --disable-documentation && make -j4 &&
+    PKG_CONFIG_PATH="/usr/lib/pkgconfig/" CFLAGS="-O2 -g -m32" LDFLAGS="-m32" ./configure --build=i686-redhat-linux --disable-documentation && make -j4 &&
     make check -j4
   tags:
-  - x86
+  - shared
   except:
   - tags
 Build and Check with mini-gmp:
@@ -23,21 +30,27 @@ Build and Check with mini-gmp:
     ./configure --disable-documentation --enable-mini-gmp && make -j4 &&
     make check -j4
   tags:
+  - shared
   except:
   - tags
 Build and Check with ubsan:
+  image: fedora:24
   script:
+  - yum install -y gmp-devel libubsan-static libubsan
   - ./.bootstrap && 
     CXXFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" CFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" ./configure 
     --disable-documentation && make -j4 && make check -j4
   tags:
-  - ubsan
+  - shared
   except:
   - tags
 Build and Check with asan:
   script:
+  - yum install -y gmp-devel
   - ./.bootstrap && 
   - CXXFLAGS="-fsanitize=address -g -O2" CFLAGS="-fsanitize=address -g -O2" ./configure --disable-documentation &&
     make -j4 && make check -j4
+  tags:
+  - shared
   except:
   - tags
-- 
GitLab