From 71afebb4681a3d298e3c5d88eb8d9ac6616d9dda Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 12 Jul 2023 13:35:50 +0200 Subject: [PATCH 1/2] preflight: old repos disablement refactor This refacts the task that disables old repositories. The speeds up this task which seems to be currently very time consuming. ``` TASK [disable older rhceph repositories if any] **************************** changed: [localhost] => (item=rhceph-4-tools-for-rhel-8-x86_64-rpms) changed: [localhost] => (item=rhceph-4-mon-for-rhel-8-x86_64-rpms) changed: [localhost] => (item=rhceph-4-osd-for-rhel-8-x86_64-rpms) changed: [localhost] => (item=rhceph-5-tools-for-rhel-8-x86_64-rpms) PLAY RECAP ***************************************************************** localhost : ok=2 changed=1 unreachable=0 failed=0 skipped=0 rescued=0 ignored=0 real 3m18.439s ``` ``` TASK [disable older rhceph repositories if any] *********** changed: [localhost] PLAY RECAP *********************************************** localhost : ok=2 changed=1 unreachable=0 failed=0 skipped=0 rescued=0 ignored=0 real 0m47.198s ``` Also, this makes sure all previous repositories are disabled for both el8 and el9. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2181243 Signed-off-by: Guillaume Abrioux (cherry picked from commit 887b89fea8d879d7fdb9fe8f6deb39f1c898213e) --- cephadm-preflight.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml index f7cbd22..9653bbe 100644 --- a/cephadm-preflight.yml +++ b/cephadm-preflight.yml @@ -24,6 +24,12 @@ - hosts: all become: true gather_facts: true + vars: + repos_to_disable: + - rhceph-4-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms + - rhceph-4-mon-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms + - rhceph-4-osd-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms + - rhceph-5-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms tasks: - name: import_role ceph_defaults import_role: @@ -41,13 +47,8 @@ - name: disable older rhceph repositories if any rhsm_repository: - name: "{{ item }}" + name: "{{ repos_to_disable }}" state: absent - loop: - - rhceph-4-tools-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms - - rhceph-4-mon-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms - - rhceph-4-osd-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms - when: ansible_facts['distribution_major_version'] | int == 8 - name: enable ceph package repositories when: ceph_origin in ['community', 'ibm'] From cfd91a308cee9e36d07abb9dd9a729dfbd678371 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 12 Jul 2023 13:54:47 +0200 Subject: [PATCH 2/2] mergify: add reef backports configuration This adds the required change in .mergify.yml in order to automate reef backports with mergify. Signed-off-by: Guillaume Abrioux (cherry picked from commit f279b6198895aed3b5f7d5285fb022c08b69e45b) --- .mergify.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 1a16d53..4bd06e7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,5 +1,12 @@ pull_request_rules: # Backports + - actions: + backport: + branches: + - reef + conditions: + - label=backport-reef + name: backport reef - actions: backport: branches: