From: Ted Zlatanov <tzz@lifelogs.com>
Date: Sun, 17 Jan 2021 13:59:59 +0000 (+0000)
Subject: ; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.
X-Git-Tag: emacs-28.0.90~4240
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=372694e7c6b264fb0c8e316d9f0033e0fd22ee7a;p=emacs.git

; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.
---

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 78743d1adb1..3214f01eddb 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -94,6 +94,11 @@ default:
     paths: []
       # - "test/**/*.log"
       # - "**/*.log"
+  # using the variables for each job
+  script:
+    - docker pull ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA}
+    # TODO: with make -j4 several of the tests were failing, for example shadowfile-tests, but passed without it
+    - docker run -i --rm -e EMACS_EMBA_CI=${EMACS_EMBA_CI} ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA} make ${make_params}
 
 .build-template:
   script:
@@ -127,12 +132,6 @@ default:
         - test/lisp/autorevert-tests.el
         - test/lisp/filenotify-tests.el
 
-  # using the variables for each job
-  script:
-    - docker pull ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA}
-    # TODO: with make -j4 several of the tests were failing, for example shadowfile-tests, but passed without it
-    - docker run -i --rm -e EMACS_EMBA_CI=${EMACS_EMBA_CI} ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA} make ${make_params}
-
 stages:
   - prep-images
   - build-images