Disable valgrind in most branches. With gcc-6 replace to stable debian image.

3 files changed, 36 insertions, 6 deletions

diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
index 5deb5a305..009e1c069 100644
--- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
@@ -186,6 +186,7 @@ gcc-6_tests_valgrind:
   - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
   - grep "invalid" logs/valg.log && exit 1 || true
   <<: *job-push
+  image: debian:stretch
   variables:
     PACKAGES: gcc-6 g++-6 
               make autoconf automake autopoint gettext 
@@ -204,6 +205,7 @@ gcc-6_tests_valgrind_i386:
   - grep "invalid" logs/valg.log && exit 1 || true
   image: vicamo/debian:sid-i386
   <<: *job-push
+  image: debian:stretch
   variables:
     PACKAGES: gcc-6 g++-6 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
index ee8b8e54d..270c206ad 100644
--- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
@@ -138,7 +138,7 @@ gcc-7_tests_i386:
   tags:
     - docker
 
-gcc-7_tests:
+gcc-7_tests_flags:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
@@ -153,6 +153,20 @@ gcc-7_tests:
   tags:
     - docker
 
+gcc-7_tests:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
+  <<: *job-push
+  variables:
+    PACKAGES: gcc-7 g++-7 
+              make autoconf automake autopoint gettext 
+              libxml2-dev libcurl4-gnutls-dev libpng-dev 
+              libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev 
+              git valgrind
+  tags:
+    - docker
+
 gcc-7_sdl2_tests_i386:
   stage: build
   script:
@@ -168,7 +182,7 @@ gcc-7_sdl2_tests_i386:
   tags:
     - docker
 
-gcc-7_tests_valgrind:
+.gcc-7_tests_valgrind:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true
@@ -185,7 +199,7 @@ gcc-7_tests_valgrind:
   tags:
     - docker
 
-gcc-7_tests_valgrind_i386:
+.gcc-7_tests_valgrind_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true
diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
index 169497e72..331a31a9e 100644
--- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
@@ -156,7 +156,7 @@ gcc-8_tests_i386:
   tags:
     - docker
 
-gcc-8_tests:
+gcc-8_tests_flags:
   stage: build
   script:
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
@@ -171,6 +171,20 @@ gcc-8_tests:
   tags:
     - docker
 
+gcc-8_tests:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
+  <<: *job-push
+  variables:
+    PACKAGES: gcc-8 g++-8 
+              make autoconf automake autopoint gettext 
+              libxml2-dev libcurl4-gnutls-dev libpng-dev 
+              libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev 
+              git valgrind
+  tags:
+    - docker
+
 gcc-8_sdl2_tests_i386:
   stage: build
   script:
@@ -186,7 +200,7 @@ gcc-8_sdl2_tests_i386:
   tags:
     - docker
 
-gcc-8_tests_valgrind:
+.gcc-8_tests_valgrind:
   stage: build
   script:
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true
@@ -203,7 +217,7 @@ gcc-8_tests_valgrind:
   tags:
     - docker
 
-gcc-8_tests_valgrind_i386:
+.gcc-8_tests_valgrind_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true