Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2021-05-25 14:44:41 -04:00
parent b845ffb60b
commit ec779e9721
9 changed files with 6 additions and 161 deletions

View file

@ -114,50 +114,6 @@ RELEASES = {'f34': {'topic': 'fedora',
'dest': os.path.join(FEDORAALTDEST, 'testing', '33', 'Modular')}
]}}
},
'f32': {'topic': 'fedora',
'version': '32',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f32-updates',
'ostrees': [{'ref': 'fedora/32/%(arch)s/updates/silverblue',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
'dest': os.path.join(FEDORADEST, '32', 'Everything')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '32', 'Everything')}
]},
'updates-testing': {
'from': 'f32-updates-testing',
'ostrees': [{'ref': 'fedora/32/%(arch)s/testing/silverblue',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '32', 'Everything')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Everything')}
]}}
},
'f32m': {'topic': 'fedora',
'version': '32m',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f32-modular-updates',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '32', 'Modular')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '32', 'Modular')}
]},
'updates-testing': {
'from': 'f32-modular-updates-testing',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '32', 'Modular')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Modular')}
]}}
},
'epel8': {'topic': 'epel',
'version': '8',
'modules': ['epel'],

View file

@ -76,7 +76,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 f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 module-package-list modular'"
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak epel8 epel8-playground epel8-modular epel7 module-package-list modular'"
cron_file=update-koji-owner
when: env == "production"
tags:

View file

@ -48,10 +48,6 @@ taglist = [
"f33-container",
"f33-modular",
"f33-flatpak",
"f32",
"f32-container",
"f32-modular",
"f32-flatpak",
"epel8",
"epel8-playground",
"epel8-modular",

View file

@ -188,7 +188,6 @@ sidetag =
tag f35-build :: allow
tag f34-build :: allow
tag f33-build :: allow
tag f32-build :: allow
tag eln-build :: allow
tag epel8-build :: allow
tag epel7-build :: allow

View file

@ -1,28 +0,0 @@
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
virtual_streams: [fedora]
document: modulemd
version: 1

View file

@ -41,7 +41,7 @@
"dist_tag": ".fc32",
"koji_name": "f32",
"name": "Fedora",
"status": "Active",
"status": "EOL",
"version": "32"
},
{

View file

@ -3,8 +3,8 @@ 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 32 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF32.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && 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 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF32.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
# Fedora 34 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org

View file

@ -7,5 +7,5 @@ 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 32 Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 6 * * * root TMPDIR=`mktemp -d /tmp/containerF32.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && 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 6 * * * root TMPDIR=`mktemp -d /tmp/containerF32.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

View file

@ -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 = "f32-infra-candidate"
to = "f32-infra-stg"
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"
@ -134,12 +128,6 @@ handlers = ["console"]
# Gated coreos-pool tag
[[consumer_config.koji_instances.primary.tags]]
from = "f32-coreos-signing-pending"
to = "coreos-pool"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f33-coreos-signing-pending"
to = "coreos-pool"
@ -261,38 +249,6 @@ handlers = ["console"]
keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f32-signing-pending"
to = "f32-updates-testing-pending"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[consumer_config.koji_instances.primary.tags.sidetags]
pattern = 'f32-build-side-<seq_id>'
from = '<sidetag>-signing-pending'
to = '<sidetag>-testing-pending'
trusted_taggers = ['bodhi']
[[consumer_config.koji_instances.primary.tags]]
from = "f32-pending"
to = "f32"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f32-modular-pending"
to = "f32-modular"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f32-modular-signing-pending"
to = "f32-modular-updates-testing-pending"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
type = "modular"
#epel8 modular tags
[[consumer_config.koji_instances.primary.tags]]
from = "epel8-modular-signing-pending"
@ -385,12 +341,6 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f32-openh264"
to = "f32-openh264"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
# f34-rebuild
[[consumer_config.koji_instances.primary.tags]]
from = "f34-rebuild"
@ -429,34 +379,6 @@ handlers = ["console"]
directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/33/x86_64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"