diff --git a/roles/bodhi2/backend/files/koji-sync-listener.py b/roles/bodhi2/backend/files/koji-sync-listener.py index 76877439a1..7cad5a8986 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 = 'f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular' + taglist = 'f32 f32-container f32-modular 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' 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 49890d5526..22285171d4 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -112,14 +112,28 @@ RELEASES = {'f31': {'topic': 'fedora', 'repos': {'epel-testing': { 'from': 'epel8-testing', 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], - 'dest': os.path.join(EPELDEST, 'testing', '8/Everything')} + 'dest': os.path.join(EPELDEST, 'testing', '8', 'Everything')} ]}, 'epel': { 'from': 'epel8', 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], - 'dest': os.path.join(EPELDEST, '8/Everything')} + 'dest': os.path.join(EPELDEST, '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 dd1559d85b..04e77f83b9 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 f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular 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'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 4de5b29790..a5940698fb 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -16,6 +16,8 @@ sigkeys = [ 'cfc659b9', [% elif release.version_int == 31 %] '3c3359c4', +[% elif release.version_int == 8 %] + '2f86d6a1', [% endif %] {% if env == "staging" %} [% if release.version_int == 8 %] @@ -35,7 +37,11 @@ module_defaults_dir = { [% endif %] {% else %} 'repo': 'https://pagure.io/releng/fedora-module-defaults.git', - 'branch': 'f[[ release.version_int ]]', + [% if release.version_int == 8 %] + 'branch': 'el[[ release.version_int ]]', + [% else %] + 'branch': 'f[[ release.version_int ]]', + [% endif %] {% endif %} 'dir': '.' } diff --git a/roles/mbs/common/files/default-modules.production/platform-el8.yaml b/roles/mbs/common/files/default-modules.production/platform-el8.yaml new file mode 100644 index 0000000000..b7a865432b --- /dev/null +++ b/roles/mbs/common/files/default-modules.production/platform-el8.yaml @@ -0,0 +1,25 @@ +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/templates/config.py b/roles/mbs/common/templates/config.py index a2446c7006..c4d947cd33 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -155,6 +155,7 @@ class ProdConfiguration(BaseConfiguration): # Fedora 28 includes 'ppc64'. F29 and later drops it. # https://fedoraproject.org/wiki/Changes/DiscontinuePPC64 'platform:f28': ['aarch64', 'armv7hl', 'i686', 'ppc64', 'ppc64le', 'x86_64', 's390x'], + 'platform:el8' : ['aarch64', 'ppc64le', 'x86_64', 's390x'] } KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos' MESSAGING_TOPIC_PREFIX = ['org.fedoraproject.prod']