From 061e828f16fc77aa51b112be011bdf476541392e Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 7 Dec 2021 13:44:36 -0800 Subject: [PATCH] fix(gitlab-ci): use logging.prod.conf for sharness Signed-off-by: Kevin Morris --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6d49a55..0166db2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,12 @@ test: - make -C po all install - make -C test clean script: + # Run sharness. + - cp logging.conf logging.conf.bak # Copy devel logging.conf to backup + - cp logging.prod.conf logging.conf # Copy in logging.prod.conf - make -C test sh # sharness tests use sqlite. + - cp logging.conf.bak logging.conf # Restore devel logging.conf + # Run pytest. - pytest # Run pytest suites. - make -C test coverage # Produce coverage reports. - flake8 --count aurweb # Assert no flake8 violations in aurweb. @@ -59,6 +64,7 @@ deploy: COMMIT_HASH: $CI_COMMIT_SHA GIT_DATA_DIR: git_data script: + - cp -vf logging.prod.conf logging.conf # Use production logging.conf - pacman -Syu --noconfirm docker docker-compose socat openssh - chmod 600 ${SSH_KEY} - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &