X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=d146b9208db69a1aafab8bb0081a9c7a38db65e8;hb=2c943b957e730bc137bfae6404369b3af34b77ce;hp=b6735a471d6ea8e3d1dd03101d1620ae6d697366;hpb=23a6faa265c1506c63a2bc068bd1b7878a5a8d64;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6735a471..d146b9208 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,27 +52,32 @@ test_sv_game:
     - make qc || exit 1
 
     - mkdir -p data/maps
-    - wget -nv -O data/maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
+    - wget -nv -O data/maps/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
 
     - while read LINE; do
         echo $LINE;
         [ "$LINE" = "All tests OK" ] && PASS=1;
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +wait +quit)
+      done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit)
     - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }
 
-    - ${ENGINE} +map gitlab-ci +sv_cmd dumpnotifs +wait +quit
+    - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit
     - diff notifications.cfg data/data/notifications_dump.cfg ||
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
 
-    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+#    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master!
+# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3
+# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames
+# but the autobuild server can run it and provide us the resulting pk3:
+    - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3
+# see also: misc/infrastructure/xonotic-release-build.cron
     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
 
-    - EXPECT=4c834aa9b5950ffe25deec1880f21641
-    - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
+    - EXPECT=ab4f1c48fe9e823e2354ad6c029feea8
+    - HASH=$(${ENGINE} +exec serverbench.cfg
       | tee /dev/stderr
-      | sed -e 's,^\[[^]]*\] ,,'
       | grep '^:'
       | grep -v '^:gamestart:'
       | grep -v '^:anticheat:'