* admin/notes/emba (Emacs jobset): Update.

* test/infra/gitlab-ci.yml (.test-template): Uncomment
'allow_failure', it isn't needed anymore.

2 files changed, 15 insertions, 9 deletions

diff --git a/admin/notes/emba b/admin/notes/emba
index 36b126e7735..4e500bc92cf 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -31,20 +31,26 @@ The Emacs jobset is defined in the Emacs source tree, file
 '.gitlab-ci.yml'.  It could be adapted for every Emacs branch, see
 <https://emba.gnu.org/help/ci/yaml/README.md>.
 
+A jobset on Gitlab is called pipeline.  Emacs pipelines run through
+the stages 'build-images', 'platform-images' and 'native-comp-images'
+(create an Emacs instance by 'make bootstrap' with different
+configuration parameters) as well as 'normal', 'slow', 'platforms' and
+'native-comp' (run respective test jobs based on the produced images).
+
 Every job runs in a Debian docker container.  It uses the local clone
 of the Emacs git repository to perform a bootstrap and test of Emacs.
 This could happen for several jobs with changed configuration, compile
 and test parameters.
 
-There are different types of jobs: 'prep-image-base' is responsible to
-prepare the environment for the following jobs.  'build-image-*' jobs
-are responsible to compile Emacs in different configuration.  The
-corresponding 'test-*' jobs run the ert tests.
+The 'build-image-*' jobs of the different '*-images' stages run only
+if there are severe changes in the Emacs sources, like in Makefiles
+etc.  Otherwise they are skipped, and the corresponding 'test-*' jobs
+run just 'make -C test ...' in the respective Docker image from a
+previous build run.
 
-A special job is 'test-all-inotify', which runs 'make check-expensive'.
-While most of the jobs run as soon as a respective file has been
-committed into the Emacs git repository, this test job runs scheduled,
-every 8 hours.
+Jobs in the 'build-images' and 'normal' stages are triggered by
+changes of respective files in the Emacs git repository.  All other
+jobs run scheduled in a pipeline every 8 hours.
 
 The log files for every test job are kept on the server for a week.
 They can be downloaded from the server, visiting the URL
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 8c4cf3f2ca9..532d333e343 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -147,7 +147,7 @@ default:
 
 .test-template:
   # Do not block later stages.
-  allow_failure: true
+  # allow_failure: true
   # Do not run fast and normal test jobs when scheduled.
   rules:
     - if: '$CI_JOB_STAGE =~ "fast|normal" && $CI_PIPELINE_SOURCE == "schedule"'