From 43137871e8d9dcee20cc0dc6ea4213af4dc1add7 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 13 Aug 2019 15:20:17 +0000 Subject: [PATCH] More changes for branching f31 from rawhide Signed-off-by: Mohan Boddu --- .../backend/templates/pungi.module.conf.j2 | 2 ++ .../backend/templates/pungi.rpm.conf.j2 | 2 ++ .../platform-f32.yaml | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 roles/mbs/common/files/default-modules.production/platform-f32.yaml diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index b5bb0c1fbb..5ce9b650c2 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -16,6 +16,8 @@ sigkeys = [ '429476b4', [% elif release.version_int == 30 %] 'cfc659b9', +[% elif release.version_int == 31 %] + '3c3359c4', [% endif %] {% if env == "staging" %} None diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index e20934cce7..2c08860b35 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -29,6 +29,8 @@ sigkeys = [ '429476b4', [% elif release.version_int == 30 %] 'cfc659b9', +[% elif release.version_int == 31 %] + '3c3359c4', [% elif release.version_int == 6 %] '0608b895', [% elif release.version_int == 7 %] diff --git a/roles/mbs/common/files/default-modules.production/platform-f32.yaml b/roles/mbs/common/files/default-modules.production/platform-f32.yaml new file mode 100644 index 0000000000..09e4872531 --- /dev/null +++ b/roles/mbs/common/files/default-modules.production/platform-f32.yaml @@ -0,0 +1,27 @@ +data: + description: Fedora 32 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: f32 + summary: Fedora 32 traditional base + context: 00000000 + version: 1 + xmd: + mbs: + buildrequires: {} + commit: f32 + requires: {} + koji_tag: module-f32-build + mse: TRUE +document: modulemd +version: 1 +