[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 372694e: ; * test/infra/gitlab-ci.yml: Merge test-template script
From: |
Teodor Zlatanov |
Subject: |
master 372694e: ; * test/infra/gitlab-ci.yml: Merge test-template script into job-template. |
Date: |
Sun, 17 Jan 2021 09:01:43 -0500 (EST) |
branch: master
commit 372694e7c6b264fb0c8e316d9f0033e0fd22ee7a
Author: Ted Zlatanov <tzz@lifelogs.com>
Commit: Ted Zlatanov <tzz@lifelogs.com>
; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.
---
test/infra/gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 78743d1..3214f01 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 372694e: ; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.,
Teodor Zlatanov <=