diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index cb784faf8c..0a9d07550a 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -132,56 +132,6 @@ RELEASES = {'f38': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '37', 'Modular')} ]}} }, - 'f36': {'topic': 'fedora', - 'version': '36', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f36-updates', - 'ostrees': [{'ref': 'fedora/36/%(arch)s/updates/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/36/%(arch)s/updates/kinoite', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '36', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '36', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f36-updates-testing', - 'ostrees': [{'ref': 'fedora/36/%(arch)s/testing/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/36/%(arch)s/testing/kinoite', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '36', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Everything')} - ]}} - }, - 'f36m': {'topic': 'fedora', - 'version': '36m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f36-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '36', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '36', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f36-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '36', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Modular')} - ]}} - }, 'epel9': {'topic': 'epel', 'version': '9', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index dd2b9a2d60..b76a0fbb1c 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -104,7 +104,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 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 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 1518ec2f21..ddb1683a83 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -48,10 +48,6 @@ taglist = [ "f37-container", "f37-modular", "f37-flatpak", - "f36", - "f36-container", - "f36-modular", - "f36-flatpak", "epel9", "epel9-next", "epel8", diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index ebf0fe8efd..8a05d6d9df 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -194,7 +194,6 @@ sidetag = tag f39-build :: allow tag f38-build :: allow tag f37-build :: allow - tag f36-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-f36.yaml b/roles/mbs/common/files/default-modules.production/platform-f36.yaml deleted file mode 100644 index 9d48e2e378..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-f36.yaml +++ /dev/null @@ -1,28 +0,0 @@ -data: - description: Fedora 36 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: f36 - summary: Fedora 36 traditional base - context: 00000000 - version: 1 - xmd: - mbs: - buildrequires: {} - commit: f36 - requires: {} - koji_tag: module-f36-build - mse: TRUE - virtual_streams: [fedora] -document: modulemd -version: 1 - \ No newline at end of file diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 6b2656e7db..f1fc342ab1 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -52,7 +52,7 @@ "dist_tag": ".fc36", "koji_name": "f36", "name": "Fedora Linux", - "status": "Active", + "status": "EOL", "version": "36" }, { @@ -63,7 +63,7 @@ "dist_tag": ".fc36", "koji_name": "f36", "name": "Fedora", - "status": "Active", + "status": "EOL", "version": "36" }, { diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index 4246d8611e..42e0e449b4 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -7,5 +7,5 @@ MAILTO=releng-cron@lists.fedoraproject.org 15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 36 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && 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/CloudF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && 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 58e3ea8cfd..4a1ff2538f 100644 --- a/roles/releng/files/container-updates +++ b/roles/releng/files/container-updates @@ -7,5 +7,5 @@ MAILTO=releng-cron@lists.fedoraproject.org 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 36 Container Updates nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && 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/containerF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR