.gitlab-ci.yml: reduced builds and stages

That is an improvement to run the CI faster.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

1 files changed, 33 insertions, 62 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c5e690d00..bea0d208ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 stages:
   - initialization
   - stage1-testing
-  - stage2-testing
 
 # we utilize the images generated by the build-images project, to
 # speed up CI runs.
@@ -22,48 +21,19 @@ init/Fedora/x86_64:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - make autoreconf
+  - ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --disable-maintainer-mode --disable-guile
+  - make syntax-check
+  - make distclean
   tags:
   - shared
   artifacts:
     untracked: true
-    expire_in: 1 day
-
-
-########################################
-# Stage 1, syntax and simple build+check
-########################################
-
-# Main build (used in stage2) - compile with C99
-ABI-check/Fedora/x86_64:
-  stage: stage1-testing
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - CFLAGS="-std=c99 -O2 -g" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc
-    && make -j$(nproc)
-  - make abi-check
-  - make pic-check
-  tags:
-  - shared
-  except:
-  - tags
-  dependencies:
-  - init/Fedora/x86_64
-  artifacts:
-    untracked: true
     expire_in: 4 days
 
-syntax-check/Fedora/x86_64:
-  stage: stage1-testing
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --disable-maintainer-mode --disable-guile
-  - make syntax-check
-  tags:
-  - shared
-  dependencies:
-  - init/Fedora/x86_64
-  except:
-  - tags
+
+##################################################
+# Stage 1, documentation, and advanced checks
+##################################################
 
 cppcheck/Fedora/x86_64:
   stage: stage1-testing
@@ -86,12 +56,9 @@ cppcheck/Fedora/x86_64:
       - tests/*.log
       - tests/*/*.log
 
-##################################################
-# Stage 2, documentation, and advanced checks
-##################################################
 
 dist/Fedora:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - git submodule update --init --no-fetch
@@ -108,17 +75,22 @@ dist/Fedora:
   except:
   - tags
 
-coverage/Fedora:
-  stage: stage2-testing
+# ABI check + coverage
+abi-coverage/Fedora:
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - git submodule update --init --no-fetch
+  - CFLAGS="-std=c99 -O2 -g" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-cxx --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc
+    && make -j$(nproc)
+  - make abi-check
+  - make pic-check
   - make -j$(nproc) check
   - make local-code-coverage-output || true
   tags:
   - shared
   dependencies:
-  - ABI-check/Fedora/x86_64
+  - init/Fedora/x86_64
   except:
   - tags
   artifacts:
@@ -127,9 +99,8 @@ coverage/Fedora:
     paths:
       - GnuTLS*-coverage/*
 
-
 minimal/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - dnf remove -y libunistring-devel libtasn1-devel libidn-devel &&
@@ -148,7 +119,7 @@ minimal/Fedora/x86_64:
   - tags
 
 no-SSL-3.0/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mkdir -p build && cd build &&
@@ -171,7 +142,7 @@ no-SSL-3.0/Fedora/x86_64:
       - build/tests/suite/*/*.log
 
 FIPS140-2/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mkdir -p build && cd build &&
@@ -193,7 +164,7 @@ FIPS140-2/Fedora/x86_64:
       - build/tests/*/*.log
 
 IDNA2003/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mkdir -p build && cd build &&
@@ -213,7 +184,7 @@ IDNA2003/Fedora/x86_64:
       - build/tests/*/*.log
 
 no-openpgp/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mkdir -p build && cd build &&
@@ -236,7 +207,7 @@ no-openpgp/Fedora/x86_64:
       - build/compat_reports/*
 
 valgrind/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - ./configure --disable-doc  --disable-guile --disable-full-test-suite --enable-valgrind-tests
@@ -257,7 +228,7 @@ valgrind/Fedora/x86_64:
       - tests/*/*.log
 
 no-tools/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - ./configure --disable-full-test-suite --disable-doc --disable-guile --disable-tools --enable-tests
@@ -278,7 +249,7 @@ no-tools/Fedora/x86_64:
       - tests/*/*.log
 
 asan/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - git submodule update --init --no-fetch
@@ -302,7 +273,7 @@ asan/Fedora/x86_64:
       - tests/suite/*/*.log
 
 clang-analyzer/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - scan-build ./configure --disable-doc --disable-guile --enable-fips140-mode --enable-valgrind-tests
@@ -323,7 +294,7 @@ clang-analyzer/Fedora/x86_64:
       - scan-build-libdane/*
 
 MinGW32/DLLs:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
@@ -361,7 +332,7 @@ MinGW32/DLLs:
       - win32-build/
 
 MinGW64/DLLs:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
@@ -399,7 +370,7 @@ MinGW64/DLLs:
       - win64-build/
 
 MinGW64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
@@ -423,7 +394,7 @@ MinGW64:
       - build/tests/*/*.log
 
 MinGW32:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
@@ -449,7 +420,7 @@ MinGW32:
 # That is a specific runner that we cannot enable universally.
 # We restrict it to builds under the $BUILD_IMAGES_PROJECT project.
 FreeBSD10/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image:
   before_script:
   - /usr/bin/true
@@ -472,7 +443,7 @@ FreeBSD10/x86_64:
 
 # We need a clean 32-bit fedora for testing
 Fedora/x86:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_X86_BUILD
   script:
   - git submodule update --init --no-fetch
@@ -494,7 +465,7 @@ Fedora/x86:
       - build/tests/suite/*/*.log
 
 ubsan-Werror/Fedora/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - git submodule update --init --no-fetch
@@ -520,7 +491,7 @@ ubsan-Werror/Fedora/x86_64:
       - tests/suite/*/*.log
 
 build/Debian/x86_64:
-  stage: stage2-testing
+  stage: stage1-testing
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
   script:
   - git submodule update --init --no-fetch