[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2ce72d2: Adapt emba control files
From: |
Michael Albinus |
Subject: |
master 2ce72d2: Adapt emba control files |
Date: |
Sun, 31 Oct 2021 12:45:49 -0400 (EDT) |
branch: master
commit 2ce72d2e6eecde9274cde5e7692b2bf34c484ae8
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt emba control files
* test/infra/Dockerfile.emba: Do not generate debug info.
* test/infra/gitlab-ci.yml (variables, default): Revert timeout
back to three hours.
(.job-template): Comment test prints.
(test-all-inotify): Exclude emacs-module-tests.el.
---
test/infra/Dockerfile.emba | 2 +-
test/infra/gitlab-ci.yml | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index cca0979..aef68c6 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -42,7 +42,7 @@ RUN apt-get update && \
COPY . /checkout
WORKDIR /checkout
RUN ./autogen.sh autoconf
-RUN ./configure CFLAGS='-O0 -g3'
+RUN ./configure
# 'make -j4 bootstrap' does not work reliably.
RUN make bootstrap
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 0b1f982..a2b36b6 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -44,8 +44,8 @@ workflow:
variables:
GIT_STRATEGY: fetch
EMACS_EMBA_CI: 1
- # Four hours, see below.
- EMACS_TEST_TIMEOUT: 14400
+ # Three hours, see below.
+ EMACS_TEST_TIMEOUT: 10800
EMACS_TEST_VERBOSE: 1
# # Use TLS
https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
# DOCKER_HOST: tcp://docker:2376
@@ -60,7 +60,7 @@ variables:
default:
image: docker:19.03.12
- timeout: 4 hours
+ timeout: 3 hours
before_script:
- docker info
- echo "docker registry is ${CI_REGISTRY}"
@@ -112,9 +112,9 @@ default:
- 'export PWD=$(pwd)'
- 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e
EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e
EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} --volumes-from $(docker ps -q -f
"label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name}
${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD
&& echo checking out these updated files && git diff --name-only FETCH_HEAD &&
( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make
- [...]
after_script:
- - docker ps -a
- - printenv
- - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export
${test_name} | tar -tvf - )
+ # - docker ps -a
+ # - printenv
+ # - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export
${test_name} | tar -tvf - )
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp
${test_name}:checkout/test ${test_name}
- test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name}
# - ls -alR ${test_name}
@@ -315,7 +315,7 @@ test-all-inotify:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
variables:
target: emacs-inotify
- make_params: check-expensive
+ make_params: check-expensive EXCLUDE_TESTS=%emacs-module-tests.el
# Two hours.
EMACS_TEST_TIMEOUT: 7200
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2ce72d2: Adapt emba control files,
Michael Albinus <=