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

This commit is contained in:
Ted Zlatanov 2021-01-17 13:59:59 +00:00
parent 1fe135a024
commit 372694e7c6
No known key found for this signature in database
GPG key ID: 11F23D0A4E4B9DEE

View file

@ -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