diff --git a/roles/bodhi2/backend/files/koji-sync-listener.py b/roles/bodhi2/backend/files/koji-sync-listener.py index dea70f876d..70690f1e92 100644 --- a/roles/bodhi2/backend/files/koji-sync-listener.py +++ b/roles/bodhi2/backend/files/koji-sync-listener.py @@ -23,7 +23,7 @@ def handle(content): sys.stdout.flush() # XXX If you modify this taglist. Please also modify the other copy in # bodhi2/backend/tasks/main.yml - taglist = 'f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular' + taglist = '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' cmd = [ '/usr/local/bin/owner-sync-pagure', '--package', package, diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 8aae50be21..8dcaf56c5e 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -108,48 +108,6 @@ RELEASES = {'f32': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')} ]}} }, - 'f30': {'topic': 'fedora', - 'version': '30', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f30-updates', - 'ostrees': [{'ref': 'fedora/30/x86_64/updates/silverblue', - 'dest': OSTREEDEST}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '30', 'Everything')}, - {'arches': ['i386', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '30', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f30-updates-testing', - 'ostrees': [{'ref': 'fedora/30/x86_64/testing/silverblue', - 'dest': OSTREEDEST}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '30', 'Everything')}, - {'arches': ['i386', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Everything')} - ]}} - }, - 'f30m': {'topic': 'fedora', - 'version': '30m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f30-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '30', 'Modular')}, - {'arches': ['i386', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '30', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f30-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '30', 'Modular')}, - {'arches': ['i386', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '30', '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 46cff41920..31cf14cecf 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -73,7 +73,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 f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-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 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'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/mbs/common/files/default-modules.production/platform-f30.yaml b/roles/mbs/common/files/default-modules.production/platform-f30.yaml deleted file mode 100644 index 06080054c0..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-f30.yaml +++ /dev/null @@ -1,28 +0,0 @@ -data: - description: Fedora 30 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: f30 - summary: Fedora 30 traditional base - context: 00000000 - version: 6 - xmd: - mbs: - buildrequires: {} - commit: f30 - requires: {} - koji_tag: module-f30-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 4b197dcad1..9a45d03f09 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": ".fc30", "koji_name": "f30", "name": "Fedora", - "status": "Active", + "status": "EOL", "version": "30" }, { diff --git a/roles/releng/files/cloud-updates b/roles/releng/files/cloud-updates index 0ef075f871..d057085244 100644 --- a/roles/releng/files/cloud-updates +++ b/roles/releng/files/cloud-updates @@ -1,6 +1,6 @@ #Fedora 30 Cloud nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && 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/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR #Fedora 32 Cloud nightly compose MAILTO=releng-cron@lists.fedoraproject.org diff --git a/roles/releng/files/container-updates b/roles/releng/files/container-updates index ac0dc25bae..a968205dbc 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/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 30 Container Updates nightly compose -MAILTO=releng-cron@lists.fedoraproject.org -45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && 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/containerF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR # Fedora 32 Container Updates nightly compose MAILTO=releng-cron@lists.fedoraproject.org