From f29b6d56b5f4cc3cab0af83207a260e45c7e4813 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 10 Jul 2023 20:16:49 +0300 Subject: [PATCH] create separate configs for MSVSphere and MSVSphere Server --- msvsphere-9-server.conf | 26 ++ msvsphere-9.conf | 281 +----------------- .../additional_packages-server.conf | 31 ++ msvsphere-server/msvsphere-9-server.conf | 16 + .../msvsphere-product-server.conf | 16 + msvsphere/additional_packages-server.conf | 31 ++ msvsphere/additional_packages.conf | 60 ++++ msvsphere/additional_packages_all.conf | 89 ++++++ msvsphere/general.conf | 132 ++++++++ msvsphere/multilib.conf | 40 +++ 10 files changed, 446 insertions(+), 276 deletions(-) create mode 100644 msvsphere-9-server.conf create mode 100644 msvsphere-server/additional_packages-server.conf create mode 100644 msvsphere-server/msvsphere-9-server.conf create mode 100644 msvsphere-server/msvsphere-product-server.conf create mode 100644 msvsphere/additional_packages-server.conf create mode 100644 msvsphere/additional_packages.conf create mode 100644 msvsphere/additional_packages_all.conf create mode 100644 msvsphere/general.conf create mode 100644 msvsphere/multilib.conf diff --git a/msvsphere-9-server.conf b/msvsphere-9-server.conf new file mode 100644 index 0000000..54e44b8 --- /dev/null +++ b/msvsphere-9-server.conf @@ -0,0 +1,26 @@ +# +# MSVSphere Server 9 Pungi configuration file +# +# Notes: +# - there is a problem with accessing git.inferitos.ru repositories via +# HTTPs from our internal network, so we have to use HTTP for now. + +from msvsphere/general import * +from msvsphere/multilib import * +from msvsphere/additional_packages-server import * + +# product information +release_name = 'MSVSphere Server' +release_short = 'MSVSphere' +release_version = '9.2' +treeinfo_version = '9' + +extra_isos = { + "Server": [{ + "include_variants": [], + "filename": "{release_short}-9.2-alpha-{arch}-server{suffix}", + "skip_src": True, + "arches": ['x86_64'], + "failable_arches": ['i386'] + }] +} diff --git a/msvsphere-9.conf b/msvsphere-9.conf index 99b474a..bbd82fa 100644 --- a/msvsphere-9.conf +++ b/msvsphere-9.conf @@ -5,119 +5,16 @@ # - there is a problem with accessing git.inferitos.ru repositories via # HTTPs from our internal network, so we have to use HTTP for now. +from msvsphere/general import * +from msvsphere/multilib import * +from msvsphere/additional_packages import * + # product information release_name = 'MSVSphere' release_short = 'MSVSphere' release_version = '9.2' treeinfo_version = '9' - -# use a remote comps.xml file from a git repository -comps_file = { - 'scm': 'git', - 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', - 'branch': 'i9.2', - 'file': 'comps.xml', - 'command': '' -} - -# alternatively, it's possible to use a local groups file -#comps_file = 'comps.xml' - - -# use a remote variants.xml file from a git repository -variants_file = { - 'scm': 'git', - 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', - 'branch': 'i9.2', - 'file': 'variants.xml', - 'command': '' -} - -# alternatively, it's possible to use a local variants file -#variants_file = 'variants.xml' - -gather_backend = 'dnf' - -# if set to True, abort the compose if some package has broken dependencies -check_deps = False - -gather_method = { - # Anything that is not AppStream, CRB or Buildroot should use the old depsolver - "^(?!(AppStream|CRB|Buildroot)).*$": { - "comps": "deps", - "json": "deps", - }, - "^(AppStream|CRB|Minimal|Server|Extras)$": "hybrid", -} - -hashed_directories = False -gather_allow_reuse = True -repoclosure_backend = 'dnf' - -# extra packages to be added -gather_prepopulate = { - 'scm': 'git', - 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere', - 'branch': 'i9.2', - 'file': 'prepopulate.json', - 'command': '' -} - -multilib = [ - ("^.*$", { - "x86_64": ["devel", "runtime"] - }), -] - -# format: {arch|*: [packages]} -multilib_blacklist = { - "*": [ - "libvirt*", # RhBug 1571159 - "java-*", # RCM-28652 - "totem", #RCM-43729 - "ocaml*", # RCM-53665 - "fwupd*", # ENGCMP-488 - "freeradius*", #RhBug 1923990 - "httpd-*", #ENGCMP-716 - "nginx-*", - "php-*", - "subversion-*", - "mariadb-common", #ENGCMP-1061 - "mariadb-devel", - "mariadb-embedded*", - "mariadb-errmsg", - "mysql-common", - "mysql-devel", - "mysql-libs", - "mecab", - "postgresql-private*", #ENGCMP-1179 - "postgresql-server*", - "bash*", #RhBug 2006138 - "xapian-core*", #RhBug 2031780 - "tk*", #RhBug 2053406 - "tcl*", - "ldns-devel*", #RhBug 2058694 - "postgresql*", #ENGCMP-2185 - ], -} - -# format: {arch|*: [packages]} -multilib_whitelist = {} - -greedy_method = "build" - -sigkeys = ['2655AD82', '2655ad82'] - -pkgset_source = 'koji' -pkgset_koji_tag = ['inferit-9_2-init', 'inferit-9-extras'] -pkgset_allow_reuse = True -koji_profile = 'koji' -runroot_method = "local" -global_runroot_method = "local" -createiso_break_hardlinks = True -iso_hfs_ppc64le_compatible = False - extra_isos = { "BaseOS": [{ "include_variants": ["AppStream", "Extras"], @@ -127,7 +24,7 @@ extra_isos = { "arches": ['x86_64'], "failable_arches": ['i386'], "extra_files": [ - { + { 'scm': 'git', 'repo': 'http://git.inferitos.ru/rpms/sphere-release.git', 'branch': 'i9', @@ -141,173 +38,5 @@ extra_isos = { "skip_src": True, "arches": ['x86_64'], "failable_arches": ['i386'] - }], - "Server": [{ - "include_variants": [], - "filename": "{release_short}-9.2-alpha-{arch}-server{suffix}", - "skip_src": True, - "arches": ['x86_64'], - "failable_arches": ['i386'] }] } - - -create_optional_isos = False -createiso_use_xorrisofs = True - -createiso_skip = [ - ("^(BaseOS|AppStream|CRB|Minimal|Server|Extras)$", { - # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330 - # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356 - # No binary or src ISOs for CRB - # No binary or src ISOs for NFV - # Note: "*" matches only binary architectures. - "*": True, - "src":True #RCM-41427 -Disable source iso generation during createiso phase - }), -] - -restricted_volid = True - -# CREATEREPO -createrepo_deltas = False -createrepo_database = True -createrepo_c = True -createrepo_checksum = 'sha256' -createrepo_use_xz = True -createrepo_enable_cache = False -createrepo_num_threads = 8 -createrepo_num_workers = 4 -createrepo_extra_args = [ - '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9', - '--revision=9.2' -] - -# CHECKSUMS -media_checksums = ['sha256'] -media_checksum_one_file = True -create_jigdo = False - -# BUILDINSTALL -# deprecated! -# bootable = True - -buildinstall_method = "lorax" - -lorax_options = [ - ("^.*$", { - "*": { - "noupgrade": False, - "rootfs_size": 3, - "version": "9.2" - } - }) -] - -# LOOKASIDE -variant_as_lookaside = [ - ('AppStream', 'BaseOS'), - ('CRB', 'BaseOS'), - ('CRB', 'AppStream'), -# ('HighAvailability', 'BaseOS'), -# ('HighAvailability', 'AppStream'), -# ("ResilientStorage", "BaseOS"), -# ("ResilientStorage", "AppStream"), -# ("RT", "BaseOS"), -# ("RT", "AppStream"), -# ("NFV", "BaseOS"), -# ("NFV", "AppStream"), - ("Extras", "BaseOS"), - ("Extras", "AppStream") -] - - -additional_packages = [ - ( - '^Minimal$', { - '*': [ - "aide", - "audispd-plugins", - "dnf-automatic", - "fapolicyd", - "gnutls-utils", - "kernel-modules-extra", - "libreswan", - "libsss_sudo", - "policycoreutils-python-utils", - "rear", - "rng-tools", - "rsyslog-gnutls", - "subscription-manager", - "usbguard", - "kernel", - "glibc-gconv-extra.i686", - "libsss_autofs", - "sssd-nfs-idmap", - "kbd-legacy" - ] - } - ), - ( - '^Server$', { - '*': [ - "aide", - "audispd-plugins", - "dnf-automatic", - "fapolicyd", - "gnutls-utils", - "kernel-modules-extra", - "libreswan", - "libsss_sudo", - "policycoreutils-python-utils", - "rear", - "rng-tools", - "rsyslog-gnutls", - "subscription-manager", - "usbguard", - "kernel", - "glibc-gconv-extra.i686", - "libsss_autofs", - "sssd-nfs-idmap", - "kbd-legacy", - "container-selinux", - "flatpak-selinux", - "libdecor", - "ibus-gtk2" - ] - } - ), - ( - '^Extras$', { - '*': [ - "anaconda-live", - "bats", - "chromium", - "epel-release", - "fontconfig-font-replacements", - "fontconfig-enhanced-defaults", - "gnome-shell-extension-appindicator", - "gnome-shell-extension-arcmenu", - "gnome-shell-extension-dash-to-panel", - "gnome-shell-extension-no-overview", - "google-roboto-fonts", - "hardinfo", - "htop", - "kora-icon-theme", - "mock", - "pipewire-module-xrdp", - "redhat-lsb", - "remmina", - "remmina-devel", - "remmina-gnome-session", - "remmina-plugins-exec", - "remmina-plugins-python", - "remmina-plugins-rdp", - "remmina-plugins-secret", - "remmina-plugins-vnc", - "remmina-plugins-www", - "salt" - ] - } - ) -] diff --git a/msvsphere-server/additional_packages-server.conf b/msvsphere-server/additional_packages-server.conf new file mode 100644 index 0000000..3f059bc --- /dev/null +++ b/msvsphere-server/additional_packages-server.conf @@ -0,0 +1,31 @@ +additional_packages = [ + ( + '^Server$', { + '*': [ + "aide", + "audispd-plugins", + "dnf-automatic", + "fapolicyd", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libsss_sudo", + "policycoreutils-python-utils", + "rear", + "rng-tools", + "rsyslog-gnutls", + "subscription-manager", + "usbguard", + "kernel", + "glibc-gconv-extra.i686", + "libsss_autofs", + "sssd-nfs-idmap", + "kbd-legacy", + "container-selinux", + "flatpak-selinux", + "libdecor", + "ibus-gtk2" + ] + } + ) +] diff --git a/msvsphere-server/msvsphere-9-server.conf b/msvsphere-server/msvsphere-9-server.conf new file mode 100644 index 0000000..be4fbf5 --- /dev/null +++ b/msvsphere-server/msvsphere-9-server.conf @@ -0,0 +1,16 @@ +# +# MSVSphere Server 9 Pungi configuration file +# +# Notes: +# - there is a problem with accessing git.inferitos.ru repositories via +# HTTPs from our internal network, so we have to use HTTP for now. + +from msvsphere/general import * +from msvsphere/multilib import * +from msvsphere/additional_packages-server import * + +# product information +release_name = 'MSVSphere Server' +release_short = 'MSVSphere' +release_version = '9.2' +treeinfo_version = '9' diff --git a/msvsphere-server/msvsphere-product-server.conf b/msvsphere-server/msvsphere-product-server.conf new file mode 100644 index 0000000..be4fbf5 --- /dev/null +++ b/msvsphere-server/msvsphere-product-server.conf @@ -0,0 +1,16 @@ +# +# MSVSphere Server 9 Pungi configuration file +# +# Notes: +# - there is a problem with accessing git.inferitos.ru repositories via +# HTTPs from our internal network, so we have to use HTTP for now. + +from msvsphere/general import * +from msvsphere/multilib import * +from msvsphere/additional_packages-server import * + +# product information +release_name = 'MSVSphere Server' +release_short = 'MSVSphere' +release_version = '9.2' +treeinfo_version = '9' diff --git a/msvsphere/additional_packages-server.conf b/msvsphere/additional_packages-server.conf new file mode 100644 index 0000000..3f059bc --- /dev/null +++ b/msvsphere/additional_packages-server.conf @@ -0,0 +1,31 @@ +additional_packages = [ + ( + '^Server$', { + '*': [ + "aide", + "audispd-plugins", + "dnf-automatic", + "fapolicyd", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libsss_sudo", + "policycoreutils-python-utils", + "rear", + "rng-tools", + "rsyslog-gnutls", + "subscription-manager", + "usbguard", + "kernel", + "glibc-gconv-extra.i686", + "libsss_autofs", + "sssd-nfs-idmap", + "kbd-legacy", + "container-selinux", + "flatpak-selinux", + "libdecor", + "ibus-gtk2" + ] + } + ) +] diff --git a/msvsphere/additional_packages.conf b/msvsphere/additional_packages.conf new file mode 100644 index 0000000..bc64423 --- /dev/null +++ b/msvsphere/additional_packages.conf @@ -0,0 +1,60 @@ +additional_packages = [ + ( + '^Minimal$', { + '*': [ + "aide", + "audispd-plugins", + "dnf-automatic", + "fapolicyd", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libsss_sudo", + "policycoreutils-python-utils", + "rear", + "rng-tools", + "rsyslog-gnutls", + "subscription-manager", + "usbguard", + "kernel", + "glibc-gconv-extra.i686", + "libsss_autofs", + "sssd-nfs-idmap", + "kbd-legacy" + ] + } + ), + ( + '^Extras$', { + '*': [ + "anaconda-live", + "bats", + "chromium", + "epel-release", + "fontconfig-font-replacements", + "fontconfig-enhanced-defaults", + "gnome-shell-extension-appindicator", + "gnome-shell-extension-arcmenu", + "gnome-shell-extension-dash-to-panel", + "gnome-shell-extension-no-overview", + "google-roboto-fonts", + "hardinfo", + "htop", + "kora-icon-theme", + "mock", + "pipewire-module-xrdp", + "redhat-lsb", + "remmina", + "remmina-devel", + "remmina-gnome-session", + "remmina-plugins-exec", + "remmina-plugins-python", + "remmina-plugins-rdp", + "remmina-plugins-secret", + "remmina-plugins-vnc", + "remmina-plugins-www", + "salt" + ] + } + ) +] diff --git a/msvsphere/additional_packages_all.conf b/msvsphere/additional_packages_all.conf new file mode 100644 index 0000000..e15f965 --- /dev/null +++ b/msvsphere/additional_packages_all.conf @@ -0,0 +1,89 @@ +additional_packages = [ + ( + '^Minimal$', { + '*': [ + "aide", + "audispd-plugins", + "dnf-automatic", + "fapolicyd", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libsss_sudo", + "policycoreutils-python-utils", + "rear", + "rng-tools", + "rsyslog-gnutls", + "subscription-manager", + "usbguard", + "kernel", + "glibc-gconv-extra.i686", + "libsss_autofs", + "sssd-nfs-idmap", + "kbd-legacy" + ] + } + ), + ( + '^Server$', { + '*': [ + "aide", + "audispd-plugins", + "dnf-automatic", + "fapolicyd", + "gnutls-utils", + "kernel-modules-extra", + "libreswan", + "libsss_sudo", + "policycoreutils-python-utils", + "rear", + "rng-tools", + "rsyslog-gnutls", + "subscription-manager", + "usbguard", + "kernel", + "glibc-gconv-extra.i686", + "libsss_autofs", + "sssd-nfs-idmap", + "kbd-legacy", + "container-selinux", + "flatpak-selinux", + "libdecor", + "ibus-gtk2" + ] + } + ), + ( + '^Extras$', { + '*': [ + "anaconda-live", + "bats", + "chromium", + "epel-release", + "fontconfig-font-replacements", + "fontconfig-enhanced-defaults", + "gnome-shell-extension-appindicator", + "gnome-shell-extension-arcmenu", + "gnome-shell-extension-dash-to-panel", + "gnome-shell-extension-no-overview", + "google-roboto-fonts", + "hardinfo", + "htop", + "kora-icon-theme", + "mock", + "pipewire-module-xrdp", + "redhat-lsb", + "remmina", + "remmina-devel", + "remmina-gnome-session", + "remmina-plugins-exec", + "remmina-plugins-python", + "remmina-plugins-rdp", + "remmina-plugins-secret", + "remmina-plugins-vnc", + "remmina-plugins-www", + "salt" + ] + } + ) +] diff --git a/msvsphere/general.conf b/msvsphere/general.conf new file mode 100644 index 0000000..6492794 --- /dev/null +++ b/msvsphere/general.conf @@ -0,0 +1,132 @@ +# use a remote comps.xml file from a git repository +comps_file = { + 'scm': 'git', + 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', + 'branch': 'i9.2', + 'file': 'comps.xml', + 'command': '' +} + +# alternatively, it's possible to use a local groups file +#comps_file = 'comps.xml' + +# use a remote variants.xml file from a git repository +variants_file = { + 'scm': 'git', + 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', + 'branch': 'i9.2', + 'file': 'variants.xml', + 'command': '' +} + +# alternatively, it's possible to use a local variants file +#variants_file = 'variants.xml' + +gather_backend = 'dnf' + +# if set to True, abort the compose if some package has broken dependencies +check_deps = False + +gather_method = { + # Anything that is not AppStream, CRB or Buildroot should use the old depsolver + "^(?!(AppStream|CRB|Buildroot)).*$": { + "comps": "deps", + "json": "deps", + }, + "^(AppStream|CRB|Minimal|Server|Extras)$": "hybrid", +} + +hashed_directories = False +gather_allow_reuse = True +repoclosure_backend = 'dnf' + +# extra packages to be added +gather_prepopulate = { + 'scm': 'git', + 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere', + 'branch': 'i9.2', + 'file': 'prepopulate.json', + 'command': '' +} + +greedy_method = "build" + +sigkeys = ['2655AD82', '2655ad82'] + +pkgset_source = 'koji' +pkgset_koji_tag = ['inferit-9_2-init', 'inferit-9-extras'] +pkgset_allow_reuse = True +koji_profile = 'koji' +runroot_method = "local" +global_runroot_method = "local" +createiso_break_hardlinks = True +iso_hfs_ppc64le_compatible = False + +create_optional_isos = False +createiso_use_xorrisofs = True + +createiso_skip = [ + ("^(BaseOS|AppStream|CRB|Minimal|Server|Extras)$", { + # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330 + # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356 + # No binary or src ISOs for CRB + # No binary or src ISOs for NFV + # Note: "*" matches only binary architectures. + "*": True, + "src":True #RCM-41427 -Disable source iso generation during createiso phase + }), +] + +restricted_volid = True + +# CREATEREPO +createrepo_deltas = False +createrepo_database = True +createrepo_c = True +createrepo_checksum = 'sha256' +createrepo_use_xz = True +createrepo_enable_cache = False +createrepo_num_threads = 8 +createrepo_num_workers = 4 +createrepo_extra_args = [ + '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9', + '--revision=9.2' +] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +# BUILDINSTALL +# deprecated! +# bootable = True + +buildinstall_method = "lorax" + +lorax_options = [ + ("^.*$", { + "*": { + "noupgrade": False, + "rootfs_size": 3, + "version": "9.2" + } + }) +] + +# LOOKASIDE +variant_as_lookaside = [ + ('AppStream', 'BaseOS'), + ('CRB', 'BaseOS'), + ('CRB', 'AppStream'), +# ('HighAvailability', 'BaseOS'), +# ('HighAvailability', 'AppStream'), +# ("ResilientStorage", "BaseOS"), +# ("ResilientStorage", "AppStream"), +# ("RT", "BaseOS"), +# ("RT", "AppStream"), +# ("NFV", "BaseOS"), +# ("NFV", "AppStream"), + ("Extras", "BaseOS"), + ("Extras", "AppStream") +] diff --git a/msvsphere/multilib.conf b/msvsphere/multilib.conf new file mode 100644 index 0000000..1beb444 --- /dev/null +++ b/msvsphere/multilib.conf @@ -0,0 +1,40 @@ +multilib = [ + ("^.*$", { + "x86_64": ["devel", "runtime"] + }), +] + +# format: {arch|*: [packages]} +multilib_blacklist = { + "*": [ + "libvirt*", # RhBug 1571159 + "java-*", # RCM-28652 + "totem", #RCM-43729 + "ocaml*", # RCM-53665 + "fwupd*", # ENGCMP-488 + "freeradius*", #RhBug 1923990 + "httpd-*", #ENGCMP-716 + "nginx-*", + "php-*", + "subversion-*", + "mariadb-common", #ENGCMP-1061 + "mariadb-devel", + "mariadb-embedded*", + "mariadb-errmsg", + "mysql-common", + "mysql-devel", + "mysql-libs", + "mecab", + "postgresql-private*", #ENGCMP-1179 + "postgresql-server*", + "bash*", #RhBug 2006138 + "xapian-core*", #RhBug 2031780 + "tk*", #RhBug 2053406 + "tcl*", + "ldns-devel*", #RhBug 2058694 + "postgresql*", #ENGCMP-2185 + ], +} + +# format: {arch|*: [packages]} +multilib_whitelist = {}