From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 31 Oct 2021 16:45:39 +0000 (+0100)
Subject: Adapt emba control files
X-Git-Tag: emacs-29.0.90~3671^2~326^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ce72d2e6eecde9274cde5e7692b2bf34c484ae8;p=emacs.git

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

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index cca0979a9e2..aef68c6e81e 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 0b1f982c212..a2b36b6af6f 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 -j4 && make ${make_params}"'
   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