diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2021-01-17 13:59:59 +0000 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2021-01-17 14:01:16 +0000 |
| commit | 372694e7c6b264fb0c8e316d9f0033e0fd22ee7a (patch) | |
| tree | 093f3ff1882eaabac69e67c6da6243275da0f921 /test | |
| parent | 1fe135a024dde56fe904c35f14d6b30add024f5b (diff) | |
| download | emacs-372694e7c6b264fb0c8e316d9f0033e0fd22ee7a.tar.gz | |
; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.
Diffstat (limited to 'test')
| -rw-r--r-- | test/infra/gitlab-ci.yml | 11 |
1 files changed, 5 insertions, 6 deletions
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 |