Re-tag jobs according to discussion in mana/appimg-builder/-/merge_requests/6glados_migration_retagging

1 files changed, 4 insertions, 62 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3be39d84..7f73ecab0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,6 @@ variables:
               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 
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # Disabled: drop 1386 support
 .gcc-8-i386:
@@ -92,8 +90,6 @@ variables:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # Do we really need to test such bleeding edge?
 # It's mostly a waste of CI time and it should be made allow-fail, perhaps?
@@ -112,8 +108,6 @@ variables:
               libxml2-dev libcurl4-gnutls-dev libpng-dev 
               libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
               git gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 
 # Disabled: drop 1386 support
@@ -132,8 +126,6 @@ variables:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # TODO: Clang 3.9 is down but we don't have a newer Clang to test?
 .clang-3.9:
@@ -151,8 +143,6 @@ variables:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 .gcc-7:
   stage: prebuild
@@ -169,8 +159,6 @@ variables:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 gcc-8:
   stage: prebuild
@@ -189,8 +177,6 @@ gcc-8:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 .gcc-7_default:
   stage: prebuild
@@ -211,8 +197,6 @@ gcc-8:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 gcc-10_default:
   stage: prebuild
@@ -233,8 +217,6 @@ gcc-10_default:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # This and the next job do not work any more:
 # access denied pulling the specified image
@@ -250,8 +232,6 @@ gcc-10_default:
   variables:
     PACKAGES: bash
     CROSS: i686-w64-mingw32.shared
-  tags:
-    - docker
 
 .mxe_gcc6_shared_64:
   only:
@@ -265,8 +245,6 @@ gcc-10_default:
   variables:
     PACKAGES: bash
     CROSS: x86_64-w64-mingw32.shared
-  tags:
-    - docker
 
 docker-windows-builder:
   stage: prebuild
@@ -296,8 +274,6 @@ gcc-5_sdl2:
               libxml2-dev libcurl4-gnutls-dev libpng-dev 
               libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # TODO: make this only run once-in-a-while (e.g. before release?)
 .gcc-10_game_only:
@@ -314,8 +290,6 @@ gcc-5_sdl2:
               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
               gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # TODO: make this only run once-in-a-while (e.g. before release?)
 .gcc-10_dyecmd_only:
@@ -331,8 +305,6 @@ gcc-5_sdl2:
               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
-  tags:
-    - docker
 
 gcc-8_unittestsbin:
   stage: prebuild
@@ -348,12 +320,12 @@ gcc-8_unittestsbin:
               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
-  tags:
-    - docker
 
 
 linters:
   stage: lint
+  tags:
+  - lightweight
   image: debian:bullseye
   script:
   - ./tools/ci/jobs/mplint.sh src po data
@@ -366,8 +338,6 @@ linters:
   variables:
     MPLINT_PACKAGE_URL: "$CI_API_V4_URL/projects/mana%2Fmplint/jobs/artifacts/master/download?job=package_debian10_buster"
     PACKAGES: git grep imagemagick pngcheck python2 python3 unzip wget
-  tags:
-    - docker
 
 
 gcc-5_h_all:
@@ -388,8 +358,6 @@ gcc-5_h_all:
               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
-  tags:
-    - docker
 
 # Disabled: drop 1386 support
 .gcc-5_h_all_i386:
@@ -408,8 +376,6 @@ gcc-5_h_all:
               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
-  tags:
-    - docker
 
 # Coverage support is broken
 .gcov_gcc7:
@@ -436,8 +402,6 @@ gcc-5_h_all:
       coverage_report:
         coverage_format: cobertura
         path: coverage/gcc-7.xml
-  tags:
-    - docker
 
 doxygen:
   stage: build
@@ -454,11 +418,11 @@ doxygen:
     paths:
       - doxygen
     expire_in: 2 days
-  tags:
-    - docker
 
 pages:
   stage: deploy
+  tags:
+  - lightweight
   image: debian:buster
   script:
   - mkdir -p public
@@ -508,8 +472,6 @@ triggers:
     ASAN_OPTIONS: "detect_leaks=0"
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_default_sanitize2_test:
@@ -534,8 +496,6 @@ triggers:
     ASAN_OPTIONS: "detect_leaks=0"
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_SDL-1.2_sanitize_test:
@@ -558,8 +518,6 @@ triggers:
               wget unzip
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_default_sanitize_test:
@@ -580,8 +538,6 @@ triggers:
               wget unzip
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 
 # disabled due gitlab bug
@@ -607,8 +563,6 @@ triggers:
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
     POST_CXXFLAGS: "-Wno-undef"
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_default_old_sanitize_test:
@@ -631,8 +585,6 @@ triggers:
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
     POST_CXXFLAGS: "-Wno-undef"
-  tags:
-    - docker
 
 # error compilation. cant find SDL.
 .gcc-10_zlib_ng_develop:
@@ -652,8 +604,6 @@ triggers:
               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
               wget unzip gdb valgrind netcat-openbsd procps
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_SDL-1.2_sanitize:
@@ -676,8 +626,6 @@ triggers:
               wget unzip
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_default_sanitize:
@@ -698,8 +646,6 @@ triggers:
               wget unzip
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-  tags:
-    - docker
 
 
 # disabled due gitlab bug
@@ -725,8 +671,6 @@ triggers:
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
     POST_CXXFLAGS: "-Wno-undef"
-  tags:
-    - docker
 
 # disabled due gitlab bug
 .gcc-10_SDL_default_old_sanitize:
@@ -749,5 +693,3 @@ triggers:
     runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
     runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
     POST_CXXFLAGS: "-Wno-undef"
-  tags:
-    - docker