diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index bfbbac4fe1..7706e0f435 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -120,50 +120,6 @@ RELEASES = {'f35': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '34', 'Modular')} ]}} }, - 'f33': {'topic': 'fedora', - 'version': '33', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f33-updates', - 'ostrees': [{'ref': 'fedora/33/%(arch)s/updates/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '33', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '33', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f33-updates-testing', - 'ostrees': [{'ref': 'fedora/33/%(arch)s/testing/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '33', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '33', 'Everything')} - ]}} - }, - 'f33m': {'topic': 'fedora', - 'version': '33m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f33-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '33', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '33', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f33-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '33', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '33', 'Modular')} - ]}} - }, 'epel9n': {'topic': 'epel', 'version': '9', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 57aa87eb6e..9b813d2067 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 f36 f36-container f36-modular f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak epel9 epel9-next epel8 epel8-next epel8-playground epel8-modular epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f36 f36-container f36-modular f35 f35-container f35-modular f34 f34-container f34-modular epel9 epel9-next epel8 epel8-next epel8-playground epel8-modular epel7 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 93c159be28..92b21a7c6b 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -49,9 +49,6 @@ taglist = [ "f34-modular", "f34-flatpak", "f33", - "f33-container", - "f33-modular", - "f33-flatpak", "epel9", "epel9-next", "epel8", diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index ab5611f1a1..c95d46152f 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -184,7 +184,6 @@ sidetag = tag f36-build :: allow tag f35-build :: allow tag f34-build :: allow - tag f33-build :: allow tag eln-build :: allow tag epel9-next-build :: allow tag epel9-build :: allow diff --git a/roles/mbs/common/files/default-modules.production/platform-f33.yaml b/roles/mbs/common/files/default-modules.production/platform-f33.yaml deleted file mode 100644 index 960356c518..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-f33.yaml +++ /dev/null @@ -1,28 +0,0 @@ -data: - description: Fedora 33 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: f33 - summary: Fedora 33 traditional base - context: 00000000 - version: 1 - xmd: - mbs: - buildrequires: {} - commit: f33 - requires: {} - koji_tag: module-f33-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 aa77350127..9f9877de24 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -63,7 +63,7 @@ "dist_tag": ".fc33", "koji_name": "f33", "name": "Fedora", - "status": "Active", + "status": "EOL", "version": "33" }, { diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index b4bc1bcb6a..e52e3767c9 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,6 +1,6 @@ # Fedora 33 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && 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 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 35 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index 83800e4a1c..ef65aa2d06 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -3,8 +3,8 @@ MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF34.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f34 && 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 -45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && 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 7 * * * root TMPDIR=`mktemp -d /tmp/containerF33.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 35 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 ae9b0782da..6aa1c1896d 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -107,12 +107,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] - from = "f33-infra-candidate" - to = "f33-infra-stg" - key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] from = "f34-infra-candidate" to = "f34-infra-stg" @@ -133,12 +127,6 @@ handlers = ["console"] # Gated coreos-pool tag - [[consumer_config.koji_instances.primary.tags]] - from = "f33-coreos-signing-pending" - to = "coreos-pool" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] from = "f34-coreos-signing-pending" to = "coreos-pool" @@ -264,38 +252,6 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('45719a39', 'd300e724') }}" type = "modular" - [[consumer_config.koji_instances.primary.tags]] - from = "f33-signing-pending" - to = "f33-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - - [consumer_config.koji_instances.primary.tags.sidetags] - pattern = 'f33-build-side-' - from = '-signing-pending' - to = '-testing-pending' - trusted_taggers = ['bodhi'] - - [[consumer_config.koji_instances.primary.tags]] - from = "f33-pending" - to = "f33" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - - [[consumer_config.koji_instances.primary.tags]] - from = "f33-modular-pending" - to = "f33-modular" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - type = "modular" - - [[consumer_config.koji_instances.primary.tags]] - from = "f33-modular-signing-pending" - to = "f33-modular-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - type = "modular" - #epel8 modular tags [[consumer_config.koji_instances.primary.tags]] from = "epel8-modular-signing-pending" @@ -412,12 +368,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('45719a39', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] - from = "f33-openh264" - to = "f33-openh264" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}" - # Side tags created by releng # f35-python