From 044556d199c0c735b22cdb05d323c8e42c61d269 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Dec 03 2019 22:26:37 +0000 Subject: add CR variant --- diff --git a/c8-stream.conf b/c8-stream.conf index 34824ec..9c0203a 100644 --- a/c8-stream.conf +++ b/c8-stream.conf @@ -1,6 +1,6 @@ from multilib import * from include-excludes import * -from images import * +from stream-images import * from version import * # PRODUCT INFO @@ -8,7 +8,7 @@ release_name = "CentOS Stream" release_short = "CentOS" release_version = "Stream" release_is_layered = False -version = "8" +version = "8-stream" # GENERAL SETTINGS bootable = True @@ -61,10 +61,10 @@ filter_system_release_packages = False gather_prepopulate = "centos-packages.json" gather_method = { - "^(?!(AppStream|PowerTools)).*$":{ + "^(?!(AppStream|PowerTools|CR)).*$":{ "comps": "deps" }, - "^(AppStream|PowerTools)$": "hybrid", + "^(AppStream|PowerTools|CR)$": "hybrid", } gather_backend = "dnf" @@ -102,7 +102,7 @@ lorax_options = [ ] buildinstall_skip = [ - ("^(AppStream|PowerTools)$", { + ("^(AppStream|PowerTools|CR|HighAvailability)$", { "*": True }), ] @@ -118,7 +118,7 @@ image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ] create_optional_isos = False createiso_skip = [ - ('^(BaseOS|AppStream|PowerTools|)$', { + ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', { '*': True, 'src':True }), diff --git a/stream-images.conf b/stream-images.conf new file mode 100644 index 0000000..7341806 --- /dev/null +++ b/stream-images.conf @@ -0,0 +1,91 @@ +image_build = { + "^BaseOS$": [ + { + "image-build": { + "format": [("docker", "tar.gz")], + "name": "CentOS-Stream-Container", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Container.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64","ppc64le","aarch64"], + "repo": [ + 'BaseOS', + ], + "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + "docker_cmd": '[ "/bin/bash" ]', + "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8-stream"}', + } + }, + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-Stream-GenericCloud", + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-GenericCloud.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64","ppc64le","aarch64"], + "repo": [ + 'BaseOS', + 'AppStream'], + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-Stream-ec2", + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-EC2.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64"], + "repo": [ + 'BaseOS', + 'AppStream'], + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], + "name": "CentOS-Stream-Vagrant", + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-x86_64-Vagrant.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64"], + "repo": [ + 'BaseOS', + 'AppStream'], + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + ] +} + +translate_paths = [ + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), +] diff --git a/variants.xml b/variants.xml index 1f0304e..f344105 100644 --- a/variants.xml +++ b/variants.xml @@ -227,6 +227,189 @@ + + + aarch64 + x86_64 + ppc64le + + + + + guest-agents + standard + base + core + + binary-intentionally-in-rhel-8 + additional-devel + anaconda-tools + conflicts-baseos + development + server-product + dial-up + networkmanager-submodules + file-server + fonts + gnome-desktop + graphical-admin-tools + hardware-monitoring + hardware-support + infiniband + headless-management + large-systems + legacy-unix + mail-server + mainframe-access + multimedia + dns-server + smart-card + smb-server + network-tools + network-file-system-client + network-server + performance + platform-devel + python-web + remote-system-management + scientific + security-tools + system-tools + workstation-product + nonmodular-appstream + standard + anaconda-tools + base + conflicts-appstream + core + additional-devel + base-x + debugging + development + dotnet-core + file-server + ftp-server + gnome-apps + gnome-desktop + guest-desktop-agents + graphical-admin-tools + graphics + infiniband + workstation-product + multimedia + mail-server + mainframe-access + network-server + network-tools + container-management + smb-server + dial-up + fonts + input-methods + multimedia + networkmanager-submodules + network-file-system-client + print-client + desktop-debugging + internet-browser + gnome-desktop + guest-agents + guest-desktop-agents + headless-management + java-platform + gnome-apps + internet-applications + office-suite + performance + platform-devel + platform-kvm + platform-microsoft + platform-vmware + scientific + ostree-support + security-tools + smart-card + system-tools + texlive + legacy-x + backup-client + remote-desktop-clients + remote-system-management + rpm-development-tools + virtualization-client + virtualization-hypervisor + virtualization-platform + virtualization-tools + web-server + + + + minimal-environment + virtualization-host-environment + custom-environment + server-product-environment + graphical-server-environment + workstation-product-environment + + + + 389-ds:1.4 + ant:1.10 + perl-App-cpanminus:1.7044 + perl-DBD-MySQL:4.046 + perl-DBD-Pg:3.7 + perl-DBD-SQLite:1.58 + perl-DBI:1.641 + container-tools:1.0 + container-tools:rhel8 + freeradius:3.0 + gimp:2.8 + go-toolset:rhel8 + httpd:2.4 + idm:DL1 + idm:client + inkscape:0.92.3 + javapackages-runtime:201801 + libselinux-python:2.8 + llvm-toolset:rhel8 + mailman:2.1 + mariadb:10.3 + maven:3.5 + mercurial:4.8 + mod_auth_openidc:2.3 + mysql:8.0 + nginx:1.14 + nginx:1.16 + nodejs:10 + nodejs:12 + parfait:0.5 + perl:5.24 + perl:5.26 + perl-FCGI:0.78 + php:7.2 + php:7.3 + pki-core:10.6 + pki-deps:10.6 + postgresql:10 + postgresql:9.6 + python27:2.7 + python36:3.6 + redis:5 + rhn-tools:1.0 + ruby:2.5 + + rust-toolset:rhel8 + satellite-5-client:1.0 + scala:2.10 + squid:4 + subversion:1.10 + swig:3.0 + varnish:6 + virt:rhel + perl-YAML:1.24 + + +