diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index a1430473a2..d8c8a73492 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -113,50 +113,6 @@ RELEASES = {'f33': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Modular')} ]}} }, - 'f31': {'topic': 'fedora', - 'version': '31', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f31-updates', - 'ostrees': [{'ref': 'fedora/31/%(arch)s/updates/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '31', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '31', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f31-updates-testing', - 'ostrees': [{'ref': 'fedora/31/%(arch)s/testing/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Everything')} - ]}} - }, - 'f31m': {'topic': 'fedora', - 'version': '31m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f31-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '31', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '31', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f31-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')} - ]}} - }, 'epel8': {'topic': 'epel', 'version': '8', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index a4b2a2b813..d84f86ae8f 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -76,7 +76,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 f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 753adc0488..41954ca6d0 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -48,10 +48,6 @@ taglist = [ "f32-container", "f32-modular", "f32-flatpak", - "f31", - "f31-container", - "f31-flatpak", - "f31-modular", "epel8", "epel8-playground", "epel8-modular", diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 2f8b71639c..4816dba4f0 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -187,6 +187,5 @@ sidetag = tag f34-build :: allow tag f33-build :: allow tag f32-build :: allow - tag f31-build :: allow tag eln-build :: allow all :: deny diff --git a/roles/mbs/common/files/default-modules.production/platform-f31.yaml b/roles/mbs/common/files/default-modules.production/platform-f31.yaml deleted file mode 100644 index 0608f93b59..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-f31.yaml +++ /dev/null @@ -1,28 +0,0 @@ -data: - description: Fedora 31 traditional base - license: - module: [MIT] - name: platform - profiles: - buildroot: - rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk, - glibc-minimal-langpack, grep, gzip, info, make, patch, redhat-rpm-config, - rpm-build, sed, shadow-utils, tar, unzip, util-linux, which, xz] - srpm-buildroot: - rpms: [bash, fedora-release, fedpkg-minimal, glibc-minimal-langpack, gnupg2, - redhat-rpm-config, rpm-build, shadow-utils] - stream: f31 - summary: Fedora 31 traditional base - context: 00000000 - version: 1 - xmd: - mbs: - buildrequires: {} - commit: f31 - requires: {} - koji_tag: module-f31-build - mse: TRUE - virtual_streams: [fedora] -document: modulemd -version: 1 - diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index d2f9a89a6a..0eae499d2b 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -41,7 +41,7 @@ "dist_tag": ".fc31", "koji_name": "f31", "name": "Fedora", - "status": "Active", + "status": "EOL", "version": "31" }, { diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index 0a37b49159..ebb807c274 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -7,5 +7,5 @@ MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF32.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 31 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR +#MAILTO=releng-cron@lists.fedoraproject.org +#15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index d3a0e142e9..6932becd76 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -1,6 +1,6 @@ #Fedora 31 Container Updates nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR +#MAILTO=releng-cron@lists.fedoraproject.org +#45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 33 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 41ab24cb2d..60295c1ca7 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -92,30 +92,6 @@ handlers = ["console"] # Temporary tags - [[consumer_config.koji_instances.primary.tags]] - from = "f31-kde" - to = "f31-kde" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f31-gnome" - to = "f31-gnome" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f31-python" - to = "f31-python" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f30-kde" - to = "f30-kde" - key = "{{ (env == 'production')|ternary('fedora-30', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('cfc659b9', 'd300e724') }}" - # Infra tags [[consumer_config.koji_instances.primary.tags]] @@ -142,12 +118,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] - from = "f31-infra-candidate" - to = "f31-infra-stg" - key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] from = "f32-infra-candidate" to = "f32-infra-stg" @@ -169,18 +139,6 @@ handlers = ["console"] # Gated coreos-pool tag - [[consumer_config.koji_instances.primary.tags]] - from = "f30-coreos-signing-pending" - to = "coreos-pool" - key = "{{ (env == 'production')|ternary('fedora-30', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('cfc659b9', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f31-coreos-signing-pending" - to = "coreos-pool" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] from = "f32-coreos-signing-pending" to = "coreos-pool" @@ -297,19 +255,6 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}" type = "modular" - [[consumer_config.koji_instances.primary.tags]] - from = "f31-signing-pending" - to = "f31-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f31-modular-signing-pending" - to = "f31-modular-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - type = "modular" - #epel8 modular tags [[consumer_config.koji_instances.primary.tags]] from = "epel8-modular-signing-pending" @@ -417,12 +362,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] - from = "f31-openh264" - to = "f31-openh264" - key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}" - # f33-rebuild [[consumer_config.koji_instances.primary.tags]] from = "f33-rebuild"