From e6944ea4c26c4131b5c4761cb17ce4747f42d410 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 19 May 2022 09:12:55 +0200 Subject: [PATCH] gitlab-ci: run test suite in the buildserver environment Run the whole test suite in an environment that is like the buildserver guest VM. This installs python3-babel because that is only used by the test suite, and not needed in the buildserver. Some extra packages are required for this test run that are not provided by the buildserver since they are not needed there: * gnupg-agent for the full signing setup * python3-babel for compiling localization files * python3-clint for fancy progress bars for users fdroid/ci-images-base is deprecated and archived. --- .gitlab-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 156c89a1..71a1e410 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,12 +5,20 @@ variables: GIT_DEPTH: 1 -# Run the whole test suite in an environment that is like the buildserver guest VM. -ci-images-base run-tests: - image: registry.gitlab.com/fdroid/ci-images-base +# Run the whole test suite in an environment that is like the +# buildserver guest VM. This installs python3-babel because that is +# only used by the test suite, and not needed in the buildserver. +# +# Some extra packages are required for this test run that are not +# provided by the buildserver since they are not needed there: +# * python3-babel for compiling localization files +# * gnupg-agent for the full signing setup +# * python3-clint for fancy progress bars for users +buildserver run-tests: + image: registry.gitlab.com/fdroid/fdroidserver:buildserver script: - - $pip install --upgrade pip setuptools wheel # make this go away: "error: invalid command 'bdist_wheel'" - - $pip install -e . + - apt-get update + - apt-get install gnupg-agent python3-babel python3-clint - ./tests/run-tests # make sure that translations do not cause stacktraces - cd $CI_PROJECT_DIR/locale @@ -29,7 +37,7 @@ ci-images-base run-tests: # The COMMIT_ID should be bumped after each release, so that the list # of sed hacks needed does not continuously grow. metadata_v0: - image: registry.gitlab.com/fdroid/ci-images-base + image: registry.gitlab.com/fdroid/fdroidserver:buildserver variables: GIT_DEPTH: 1000 RELEASE_COMMIT_ID: 37c95f59a17d86723fdb71e984121726db777f32 # 2.0a5~