From c8b06bd8aacfb5d015e3879c98f5ccba1dbafd02 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 18:51:15 +0200 Subject: [PATCH] Tell apt-daily to gtfo to prevent it from messing with dpkg/apt locks --- .gitlab/ci/install.gitlab-ci.yml | 4 ++-- .gitlab/ci/test.gitlab-ci.yml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 8ca18b60e..28d0bb41b 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -29,9 +29,9 @@ install-postinstall: - systemctl -q stop apt-daily.timer - systemctl -q stop apt-daily-upgrade.timer - systemctl -q stop apt-daily.service - - systemctl -q stop apt-daily-upgrade.servic + - systemctl -q stop apt-daily-upgrade.service - systemctl -q disable apt-daily.timer - systemctl -q disable apt-daily-upgrade.timer - systemctl -q disable apt-daily.service - - systemctl -q disable apt-daily-upgrade.servicee + - systemctl -q disable apt-daily-upgrade.service - yunohost tools postinstall -d domain.tld -p the_password --ignore-dyndns diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 06e9eeed6..900d68bc3 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -1,4 +1,12 @@ .install_debs: &install_debs + - systemctl -q stop apt-daily.timer + - systemctl -q stop apt-daily-upgrade.timer + - systemctl -q stop apt-daily.service + - systemctl -q stop apt-daily-upgrade.service + - systemctl -q disable apt-daily.timer + - systemctl -q disable apt-daily-upgrade.timer + - systemctl -q disable apt-daily.service + - systemctl -q disable apt-daily-upgrade.service - apt update - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb