From 597f85aa2114b02f5e22e24be92262f263141d73 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Thu, 2 Mar 2023 18:46:03 +0100 Subject: [PATCH] Retire epel8-modular Signed-off-by: Tomas Hrcka --- roles/bodhi2/backend/files/new-updates-sync | 14 ----------- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/koji_sync_listener.toml | 1 - .../platform-el8.yaml | 25 ------------------- .../default-modules.staging/platform-el8.yaml | 25 ------------------- .../templates/robosignatory.toml.j2 | 8 ------ roles/s3-mirror/tasks/main.yml | 18 ------------- 7 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 roles/mbs/common/files/default-modules.production/platform-el8.yaml delete mode 100644 roles/mbs/common/files/default-modules.staging/platform-el8.yaml diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 2b01002bf2..4b776d013d 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -238,20 +238,6 @@ RELEASES = {'f38': {'topic': 'fedora', 'dest': os.path.join(EPELDEST, 'next', '8', 'Everything')} ]}} }, - 'epel8m': {'topic': 'epel', - 'version': '8m', - 'modules': ['epel'], - 'repos': {'epel': { - 'from': 'epel8-modular-updates', - 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], - 'dest': os.path.join(EPELDEST, '8', 'Modular')}, - ]}, - 'epel-testing': { - 'from': 'epel8-modular-updates-testing', - 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], - 'dest': os.path.join(EPELDEST, 'testing', '8', 'Modular')}, - ]}} - }, 'epel7': {'topic': 'epel', 'version': '7', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 85016b7a17..11ef8f66c4 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -87,7 +87,7 @@ # bodhi2/backend/files/koji_sync_listener.py # This cronjob runs only once a day. The listener script runs reactively. cron: name="owner-sync" minute="15" hour="4" user="root" - job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f39 f39-container f39-modular f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f39 f39-container f39-modular f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'" cron_file=update-koji-owner user=apache when: env == "production" diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 42b9b153dc..1518ec2f21 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -56,7 +56,6 @@ taglist = [ "epel9-next", "epel8", "epel8-next", - "epel8-modular", "epel7", "module-package-list", "modular", diff --git a/roles/mbs/common/files/default-modules.production/platform-el8.yaml b/roles/mbs/common/files/default-modules.production/platform-el8.yaml deleted file mode 100644 index b7a865432b..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-el8.yaml +++ /dev/null @@ -1,25 +0,0 @@ -document: modulemd -version: 1 -data: - name: platform - stream: el8 - version: 1 - context: 00000000 - summary: EPEL 8 base - description: EPEL 8 base - license: - module: [MIT] - profiles: - buildroot: - rpms: [bash, bzip2, coreutils, cpio, diffutils, epel-release, epel-rpm-macros, fedpkg-minimal, findutils, gawk, gcc, gcc-c++, grep, gzip, info, make, patch, redhat-release, redhat-release-everything, redhat-release-server, redhat-rpm-config, rpm-build, sed, shadow-utils, tar, unzip, util-linux, util-linux-ng, which, xz] - srpm-buildroot: - rpms: [bash, epel-release, epel-rpm-macros, fedpkg-minimal, git, gnupg, make, redhat-release, redhat-release-everything, redhat-release-server, redhat-rpm-config, rpm-build, shadow-utils] - xmd: - mbs: - buildrequires: {} - commit: el8 - requires: {} - koji_tag: module-el8-build - mse: TRUE - default_modules_scm_url: https://pagure.io/releng/fedora-module-defaults.git - use_default_modules: TRUE diff --git a/roles/mbs/common/files/default-modules.staging/platform-el8.yaml b/roles/mbs/common/files/default-modules.staging/platform-el8.yaml deleted file mode 100644 index df02347a11..0000000000 --- a/roles/mbs/common/files/default-modules.staging/platform-el8.yaml +++ /dev/null @@ -1,25 +0,0 @@ -document: modulemd -version: 1 -data: - name: platform - stream: el8 - version: 1 - context: 00000000 - summary: EPEL 8 base - description: EPEL 8 base - license: - module: [MIT] - profiles: - buildroot: - rpms: [bash, bzip2, coreutils, cpio, diffutils, epel-release, epel-rpm-macros, fedpkg-minimal, findutils, gawk, gcc, gcc-c++, grep, gzip, info, make, patch, redhat-release, redhat-release-everything, redhat-release-server, redhat-rpm-config, rpm-build, sed, shadow-utils, tar, unzip, util-linux, util-linux-ng, which, xz] - srpm-buildroot: - rpms: [bash, epel-release, epel-rpm-macros, fedpkg-minimal, git, gnupg, make, redhat-release, redhat-release-everything, redhat-release-server, redhat-rpm-config, rpm-build, shadow-utils] - xmd: - mbs: - buildrequires: {} - commit: el8 - requires: {} - koji_tag: module-el8-build - mse: TRUE - default_modules_scm_url: https://pagure.io/modularity/fedora-stg-module-defaults.git - use_default_modules: TRUE diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 1fd7300202..cb82f0a88a 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -369,14 +369,6 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}" type = "modular" - #epel8 modular tags - [[consumer_config.koji_instances.primary.tags]] - from = "epel8-modular-signing-pending" - to = "epel8-modular-updates-testing-pending" - key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('2f86d6a1', 'd300e724') }}" - type = "modular" - # Gated bodhi updates [[consumer_config.koji_instances.primary.tags]] diff --git a/roles/s3-mirror/tasks/main.yml b/roles/s3-mirror/tasks/main.yml index 83fc44a3ec..10f014e27f 100644 --- a/roles/s3-mirror/tasks/main.yml +++ b/roles/s3-mirror/tasks/main.yml @@ -141,24 +141,6 @@ tags: - s3-mirror -- name: s3sync cron - epel 8 Modular x86_64 - cron: name="s3sync-epel8-modular-x86_64" minute="32" hour="3,6,9,12,15,17,20,23" user="s3-mirror" - job='/usr/local/bin/lock-wrapper s3sync-epel8-modular-x86_64 "/usr/local/bin/s3-sync-path.sh /pub/epel/8/Modular/x86_64/" 2>&1 | /usr/local/bin/nag-once s3-epel8-modular-x86_64.sh 1d 2>&1' - cron_file=s3-epel8-modular-x86_64.sh - disabled=true - when: env != 'staging' and inventory_hostname.startswith('mm-backend01.') - tags: - - s3-mirror - -- name: s3sync cron - epel 8 Modular aarch64 - cron: name="s3sync-epel8-modular-aarch64" minute="27" hour="4,7,10,13,16,19,22" user="s3-mirror" - job='/usr/local/bin/lock-wrapper s3sync-epel8-modular-aarch64 "/usr/local/bin/s3-sync-path.sh /pub/epel/8/Modular/aarch64/" 2>&1 | /usr/local/bin/nag-once s3-epel8-modular-aarch64.sh 1d 2>&1' - cron_file=s3-epel8-modular-aarch64.sh - disabled=true - when: env != 'staging' and inventory_hostname.startswith('mm-backend01.') - tags: - - s3-mirror - #- name: s3sync-logs cron # cron: name="s3sync-logs" hour="0" user="root" # job='/usr/local/bin/lock-wrapper s3sync-logs "/bin/sleep $((${RANDOM} \% 300)); /usr/local/bin/s3sync-logs >> /var/log/s3-mirror-logs/s3sync-logs.log 2>&1" | /usr/local/bin/nag-once s3mirror-logs 12h 2>&1'