From 8af4354537891e67e922e36451b40828173440d2 Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Wed, 27 Sep 2023 13:17:15 +0300 Subject: [PATCH 1/2] PMM-7 Update CODEOWNERS (#2503) --- .github/CODEOWNERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 71e4fab6ff..68d20180a2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,16 +1,11 @@ * @percona/pmm-review-be -/build/ @atymchuk @percona/pmm-review-be -/admin/ @percona/pmm-review-be /agent/agents/postgres/ @JiriCtvrtka @percona/pmm-review-be /agent/runner/ @artemgavrilov @percona/pmm-review-be /api/ @BupycHuk @percona/pmm-review-be -/docs/api/ @atymchuk @percona/pmm-review-be /managed/services/checks/ @idoqo @percona/pmm-review-be -/managed/ @percona/pmm-review-be /managed/services/dbaas @gen1us2k @recharte @percona/pmm-review-be /managed/services/management/dbaas @gen1us2k @recharte @percona/pmm-review-be /update/ @BupycHuk @talhabinrizwan @percona/pmm-review-be -/api-tests/ @percona/pmm-review-be **/go.mod @percona/pmm-review-dependency @percona/pmm-review-be **/Dockerfile @percona/pmm-review-dependency @percona/pmm-review-be /cli-tests/package.json @percona/pmm-review-dependency @yurkovychv From 7678adcf9a806c795f32d608d3f4d5f0835f36c7 Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Wed, 27 Sep 2023 13:29:53 +0300 Subject: [PATCH 2/2] PMM-7 Fix the upgrade test (dry-run) (#2505) * PMM-7 Fix the upgrade test (dry-run) The test fails with "ERROR: no such process/group: clickhouse" * PMM-12457 fix punctuation --------- Co-authored-by: Nurlan Moldomurov --- .../playbook/tasks/roles/clickhouse/tasks/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml b/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml index 2fb89b954b..a6e441b4b0 100644 --- a/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml +++ b/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml @@ -1,6 +1,8 @@ --- - name: Stop and remove clickhouse before update | EL7 - when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7' + when: + - ansible_distribution == 'CentOS' + - ansible_distribution_major_version == '7' command: supervisorctl {{ item }} clickhouse changed_when: True loop: @@ -13,7 +15,11 @@ register: supervisord_socket - name: Stop and remove clickhouse before update | EL9 - when: supervisord_socket.stat.exists and (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9' + when: + - supervisord_socket.stat.exists + - ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux' + - ansible_distribution_major_version == '9' + - not ansible_check_mode command: /usr/local/bin/supervisorctl {{ item }} clickhouse become: true loop: