From 4022e586790dd1c60d3f6fd46c1eb8207dad66d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20V=C3=A1vra?= Date: Fri, 6 Sep 2024 11:46:05 +0200 Subject: [PATCH 1/2] ci: Remove Fedora 41 and 42 from matrix on sssd-2-8 --- contrib/ci/get-matrix.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/ci/get-matrix.py b/contrib/ci/get-matrix.py index 7ff5f1d8a8b..c87b03d81f2 100755 --- a/contrib/ci/get-matrix.py +++ b/contrib/ci/get-matrix.py @@ -26,13 +26,15 @@ def get_fedora_releases(type, exclude=[]): def get_fedora_matrix(): fedora_stable = get_fedora_releases('current') - fedora_devel = get_fedora_releases('pending', exclude=['eln']) - fedora_frozen = get_fedora_releases('frozen', exclude=['eln']) + # These are now F41 and f42 that come with sssd-2.10 + # so there is no point trying to install 2.8 on these. + # fedora_devel = get_fedora_releases('pending', exclude=['eln']) + # fedora_frozen = get_fedora_releases('frozen', exclude=['eln']) matrix = [] matrix.extend(['fedora-{0}'.format(x) for x in fedora_stable]) - matrix.extend(['fedora-{0}'.format(x) for x in fedora_devel]) - matrix.extend(['fedora-{0}'.format(x) for x in fedora_frozen]) + # matrix.extend(['fedora-{0}'.format(x) for x in fedora_devel]) + # matrix.extend(['fedora-{0}'.format(x) for x in fedora_frozen]) return matrix From c8f7bd90d3afba48dc171f6acbabea83adc027ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20V=C3=A1vra?= Date: Mon, 9 Sep 2024 11:41:49 +0200 Subject: [PATCH 2/2] ci: Exclude fedora-41, fedora-42, fedora-rawhide, c8s, c10s from build of sssd-2-8 --- .github/workflows/copr_build.yml | 2 +- contrib/ci/get-matrix.py | 43 ++------------------------------ 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml index b4bee2a3ce0..b48d63138c2 100644 --- a/.github/workflows/copr_build.yml +++ b/.github/workflows/copr_build.yml @@ -70,7 +70,7 @@ jobs: with: coprcfg: ${{ steps.copr.outputs.coprcfg }} filter: "fedora-.+-x86_64|centos-stream-.*-x86_64" - exclude: "fedora-eln-.+" + exclude: "fedora-eln-.+|fedora-41-x86_64|fedora-42-x86_64|fedora-rawhide-x86_64|centos-stream-8-x86_64|centos-stream-10-x86_64" - name: Create copr project uses: next-actions/copr/create-project@master diff --git a/contrib/ci/get-matrix.py b/contrib/ci/get-matrix.py index c87b03d81f2..fae97db9794 100755 --- a/contrib/ci/get-matrix.py +++ b/contrib/ci/get-matrix.py @@ -12,53 +12,14 @@ import argparse import os - -def get_fedora_releases(type, exclude=[]): - r = requests.get(f'https://bodhi.fedoraproject.org/releases?state={type}') - r.raise_for_status() - - versions = [x['version'] for x in r.json()['releases'] if x['id_prefix'] == 'FEDORA'] - versions = list(set(versions) - set(exclude)) - versions.sort() - - return versions - - -def get_fedora_matrix(): - fedora_stable = get_fedora_releases('current') - # These are now F41 and f42 that come with sssd-2.10 - # so there is no point trying to install 2.8 on these. - # fedora_devel = get_fedora_releases('pending', exclude=['eln']) - # fedora_frozen = get_fedora_releases('frozen', exclude=['eln']) - - matrix = [] - matrix.extend(['fedora-{0}'.format(x) for x in fedora_stable]) - # matrix.extend(['fedora-{0}'.format(x) for x in fedora_devel]) - # matrix.extend(['fedora-{0}'.format(x) for x in fedora_frozen]) - - return matrix - - -def get_centos_matrix(): - return ['centos-8', 'centos-9'] - - -def get_other_matrix(): - return ['debian-latest'] - - if __name__ == "__main__": parser = argparse.ArgumentParser(description='Get GitHub actions CI matrix') parser.add_argument('--action', action='store_true', help='It is run in GitHub actions mode') args = parser.parse_args() - fedora = sorted(get_fedora_matrix()) - centos = sorted(get_centos_matrix()) - other = sorted(get_other_matrix()) - matrix = { - 'intgcheck': [*fedora, *centos, *other], - 'multihost': [*fedora, *centos], + 'intgcheck': ['centos-9', 'debian-latest'], + 'multihost': ['centos-9'], } print(json.dumps(matrix, indent=2))