From b0828d29f16b1265358bb1d67000d94a4f87ce63 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Mon, 4 Oct 2021 17:24:27 -0400 Subject: [PATCH 1/2] add apt upgrade to all packages prior to changes to sources lists --- .circleci/config.yml | 2 +- .../ansible-base/roles/prepare-servers/tasks/main.yml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e2f342411..7536c393ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -357,7 +357,7 @@ workflows: branches: # Ignore needs to be here explicitely as only clause introduced in PR #6086 might be removed afterwards. ignore: /i18n-.*/ - only: /release\/.*/ + only: /(stg-|release\/).*/ requires: - lint - translation-tests: diff --git a/install_files/ansible-base/roles/prepare-servers/tasks/main.yml b/install_files/ansible-base/roles/prepare-servers/tasks/main.yml index e693ae3c4c..3947934629 100644 --- a/install_files/ansible-base/roles/prepare-servers/tasks/main.yml +++ b/install_files/ansible-base/roles/prepare-servers/tasks/main.yml @@ -49,3 +49,11 @@ purge: yes tags: - apt + +- name: Upgrade all packages + apt: + name: "*" + state: latest + update_cache: yes + tags: + - apt From c7db56726e612e6cc6a1e07188f780e665364fbb Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Mon, 4 Oct 2021 20:23:29 -0400 Subject: [PATCH 2/2] Added dist-upgrade during server install prep --- .../ansible-base/roles/prepare-servers/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install_files/ansible-base/roles/prepare-servers/tasks/main.yml b/install_files/ansible-base/roles/prepare-servers/tasks/main.yml index 3947934629..4df16e0216 100644 --- a/install_files/ansible-base/roles/prepare-servers/tasks/main.yml +++ b/install_files/ansible-base/roles/prepare-servers/tasks/main.yml @@ -50,10 +50,10 @@ tags: - apt -- name: Upgrade all packages +- name: Ensure dist-upgrade before SecureDrop install apt: - name: "*" - state: latest + upgrade: dist update_cache: yes tags: - apt + - apt-upgrade