Merge remote-tracking branch 'origin/master' into feature/pgtk

1 files changed, 8 insertions, 2 deletions

diff --git a/admin/notes/emba b/admin/notes/emba
index 4e500bc92cf..f1b52b2cde0 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -28,15 +28,21 @@ The messages contain a URL to the log file of the failed job, like
 * Emacs jobset
 
 The Emacs jobset is defined in the Emacs source tree, file
-'.gitlab-ci.yml'.  It could be adapted for every Emacs branch, see
+'.gitlab-ci.yml'.  All related files are located in directory
+'test/infra'.  They 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
+configuration parameters) as well as 'normal', 'platforms' and
 'native-comp' (run respective test jobs based on the produced images).
 
+The jobs for stage 'normal' are contained in the file
+'test/infra/test-jobs.yml'.  This file is generated by calling 'make
+-C test generate-test-jobs' in the Emacs source tree, and the
+resulting file shall be pushed to the Emacs git repository afterwards.
+
 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