init: remove modularity

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
This commit is contained in:
Samyak Jain 2023-07-31 11:35:25 +05:30 committed by humaton
parent 4d76ccac6b
commit 1dd91a8543
4 changed files with 17 additions and 88 deletions

View file

@ -41,7 +41,7 @@
srpm-build: "{{srpm_build}}"
extra:
mock.package_manager: dnf
mock.new_chroot : 0
mock.new_chroot: 0
tags: rpm
- name: create the {{release}} tags
@ -55,16 +55,16 @@
- parent: "{{ item.parent }}"
priority: 0
loop:
- { name: "{{release}}-updates", perm: admin, parent: "{{release}}" , arches: ""}
- { name: "{{release}}-updates-testing", perm: admin, parent: "{{release}}", arches: "" }
- { name: "{{release}}-updates-pending", perm: admin, parent: "{{release}}", arches: "" }
- { name: "{{release}}-override", perm: fedora-override, parent: "{{release}}", arches: "" }
- { name: "{{release}}-updates-candidate", perm: '', parent: "{{release}}", arches: "" }
- { name: "{{release}}-compose", perm: '', parent: "{{release}}", arches: "" }
- { name: "{{release}}-updates-testing-pending", perm: 'autosign', parent: "{{release}}-updates-testing", arches: "" }
- { name: "{{release}}-signing-pending", perm: 'autosign', parent: "{{release}}-updates-testing-pending", arches: "" }
- { name: "{{release}}-pending", perm: '', parent: "{{release}}-updates", arches: "" }
- { name: "{{release}}-build", perm: 'admin', parent: "{{release}}-override", arches: "armv7hl i686 x86_64 aarch64 ppc64le s390x" }
- {name: "{{release}}-updates", perm: admin, parent: "{{release}}", arches: ""}
- {name: "{{release}}-updates-testing", perm: admin, parent: "{{release}}", arches: ""}
- {name: "{{release}}-updates-pending", perm: admin, parent: "{{release}}", arches: ""}
- {name: "{{release}}-override", perm: fedora-override, parent: "{{release}}", arches: ""}
- {name: "{{release}}-updates-candidate", perm: '', parent: "{{release}}", arches: ""}
- {name: "{{release}}-compose", perm: '', parent: "{{release}}", arches: ""}
- {name: "{{release}}-updates-testing-pending", perm: 'autosign', parent: "{{release}}-updates-testing", arches: ""}
- {name: "{{release}}-signing-pending", perm: 'autosign', parent: "{{release}}-updates-testing-pending", arches: ""}
- {name: "{{release}}-pending", perm: '', parent: "{{release}}-updates", arches: ""}
- {name: "{{release}}-build", perm: 'admin', parent: "{{release}}-override", arches: "armv7hl i686 x86_64 aarch64 ppc64le s390x"}
tags: rpm
- name: create the main infra tags
@ -80,8 +80,8 @@
tag2distrepo.enabled: "true"
tag2distrepo.keys: 47dd8ef9
loop:
- { name: "{{release}}-infra", perm: 'infra', parent: "{{release}}-build", arches: "" }
- { name: "{{release}}-infra-stg", perm: 'infra', parent: "{{release}}-infra", arches: "" }
- {name: "{{release}}-infra", perm: 'infra', parent: "{{release}}-build", arches: ""}
- {name: "{{release}}-infra-stg", perm: 'infra', parent: "{{release}}-infra", arches: ""}
tags: infra
- name: create the other infra tags
@ -94,8 +94,8 @@
- parent: "{{ item.parent }}"
priority: 0
loop:
- { name: "{{release}}-infra-candidate", perm: 'infra', parent: "{{release}}-infra-stg", arches: "" }
- { name: "{{release}}-infra-build", perm: 'infra', parent: "{{release}}-infra-stg", arches: "" }
- {name: "{{release}}-infra-candidate", perm: 'infra', parent: "{{release}}-infra-stg", arches: ""}
- {name: "{{release}}-infra-build", perm: 'infra', parent: "{{release}}-infra-stg", arches: ""}
tags: infra
@ -127,8 +127,7 @@
- parent: "{{release}}"
priority: 0
loop:
- { name: "{{release}}-modularity", perm: '', parent: "", arches: "" }
- { name: "{{release}}-container-build", perm: '', parent: "{{release}}-container", arches: "x86_64" }
- {name: "{{release}}-container-build", perm: '', parent: "{{release}}-container", arches: "x86_64"}
tags: openh264
@ -165,60 +164,6 @@
tag2distrepo.enabled: "true"
tags: coreos
- name: create the main modularity tags
koji_tag:
koji: koji
name: "{{release}}-modular"
state: present
perm: autosign
extra:
mock.package_manager: dnf
tags: modularity
- name: create the rest of the modularity tags
koji_tag:
koji: koji
name: "{{ item.name }}"
state: present
perm: "{{ item.perm }}"
arches: "{{item.arches}}"
inheritance:
- parent: "{{ item.parent }}"
priority: 0
loop:
- { name: "{{release}}-modular-updates", perm: admin, parent: "{{release}}-modular" , arches: ""}
- { name: "{{release}}-modular-updates-candidate", perm: '', parent: "{{release}}-modular-updates", arches: "" }
- { name: "{{release}}-modular-updates-testing", perm: admin, parent: "{{release}}-modular-updates", arches: "" }
- { name: "{{release}}-modular-updates-testing-pending", perm: 'autosign', parent: "{{release}}-modular-updates-testing", arches: "" }
- { name: "{{release}}-modular-updates-pending", perm: admin, parent: "{{release}}-modular-updates", arches: "" }
- { name: "{{release}}-modular-signing-pending", perm: 'autosign', parent: "{{release}}-modular-updates-testing-pending", arches: "" }
- { name: "{{release}}-modular-override", perm: fedora-override, parent: "{{release}}-modular-updates", arches: "" }
- { name: "{{release}}-modular-pending", perm: '', parent: "{{release}}-modular-updates", arches: "" }
tags: modularity
- name: add the modularity external repo
koji_external_repo:
koji: koji
name: "{{release}}-build"
url: "https://kojipkgs.fedoraproject.org/repos/{{release}}-build/latest/$arch/"
state: present
tags: modularity
- name: create the module-{{release}}-build tag
koji_tag:
koji: koji
name: "module-{{release}}-build"
state: present
inheritance:
- parent: "module-package-list"
priority: 0
external_repos:
- repo: "{{release}}-build"
priority: 5
tags: modularity
- name: create the {{release}} target
koji_target:

View file

@ -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 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 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"

View file

@ -38,8 +38,6 @@ arguments = {}
taglist = [
"f39",
"f39-container",
"f39-modular",
"f39-flatpak",
"f38",
"f38-container",
"f38-modular",

View file

@ -207,20 +207,6 @@ handlers = ["console"]
file_signing_key = "fedora-39-ima"
{% endif %}
[[consumer_config.koji_instances.primary.tags]]
from = "f39-modular-pending"
to = "f39-modular"
key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f39-modular-updates-candidate"
to = "f39-modular"
key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
type = "modular"
# Branched
[[consumer_config.koji_instances.primary.tags]]