#125 Port manifest file to YAML
Opened 5 years ago by walters. Modified 5 years ago
walters/fedora-atomic yaml-port  into  master

Port manifest file to YAML
Colin Walters • 5 years ago  
file removed
-149
@@ -1,149 +0,0 @@ 

- {

-     "ref": "fedora/rawhide/${basearch}/atomic-host",

-     "ex-jigdo-spec": "fedora-atomic-host.spec",

- 

-     "repos": ["fedora-rawhide"],

- 

-     "selinux": true,

- 

-     "documentation": false,

- 

-     "automatic_version_prefix": "29",

-     "mutate-os-release": "29",

- 

-     "initramfs-args": ["--no-hostonly", "--add", "iscsi"],

-     "boot_location": "new",

- 

-     "install-langs-comment": "Keep this in sync with treecompose-post.sh",

-     "install-langs": [

-       "pt_BR",

-       "fr",

-       "fr_FR",

-       "de",

-       "de_DE",

-       "it",

-       "it_IT",

-       "ru",

-       "ru_RU",

-       "es",

-       "es_ES",

-       "en_US",

-       "zh_CN",

-       "ja",

-       "ja_JP",

-       "ko",

-       "ko_KR",

-       "zh_TW",

-       "as",

-       "as_IN",

-       "bn",

-       "bn_IN",

-       "gu",

-       "gu_IN",

-       "hi",

-       "hi_IN",

-       "kn",

-       "kn_IN",

-       "ml",

-       "ml_IN",

-       "mr",

-       "mr_IN",

-       "or",

-       "or_IN",

-       "pa",

-       "pa_IN",

-       "ta",

-       "ta_IN",

-       "te",

-       "te_IN"

-     ],

- 

-     "postprocess-script": "treecompose-post.sh",

- 

-     "etc-group-members": ["wheel", "docker"],

- 

-     "ignore-removed-users": ["root"],

-     "ignore-removed-groups": ["root"],

-     "check-passwd": { "type": "file", "filename": "passwd" },

-     "check-groups": { "type": "file", "filename": "group" },

- 

-     "packages": ["atomic",

-          "glibc", "nss-altfiles", "shadow-utils",

-          "sssd-client", "libsss_sudo",

-          "fedora-release-atomichost",

-          "dracut-config-generic", "kernel",

-          "dracut-network",

-          "rpm-ostree", "lvm2",

-          "chrony",

-          "cryptsetup",

-          "authconfig",

-          "btrfs-progs", "e2fsprogs", "xfsprogs",

-          "gnupg2",

-          "basesystem",

-          "python",

-          "bash",

-          "xz", "gzip", "bzip2",

-          "coreutils",

-          "bridge-utils",

-          "which",

-          "nfs-utils",

-          "curl",

-          "iptables-services", "iptables", "firewalld",

-          "NetworkManager",

-          "dnsmasq",

-          "hostname", "initscripts", "iproute", "iputils", "less",

-          "sos",

-          "openssh-clients", "openssh-server", "passwd",

-          "policycoreutils", "procps-ng", "rootfiles", "rpm",

-          "selinux-policy-targeted", "setup", "shadow-utils",

-          "sudo", "systemd", "systemd-container",

-          "util-linux", "vim-minimal",

-          "less",

-          "tar",

-          "cloud-init",

-          "cloud-utils-growpart",

-          "rsync",

-          "bash-completion",

-          "tmux", "screen",

-          "strace", "lsof", "tcpdump", "nmap-ncat",

-          "policycoreutils-python",

-          "policycoreutils-python-utils",

-          "setools-console",

-          "audit",

-          "cockpit-bridge",

-          "cockpit-system",

-          "cockpit-docker",

-          "cockpit-networkmanager",

-          "cockpit-ostree",

-          "docker",

-          "python-docker",

-          "iscsi-initiator-utils",

-          "glusterfs", "glusterfs-fuse",

-          "ceph-common",

-          "oddjob-mkhomedir",

-          "oci-systemd-hook",

-          "mdadm",

-          "runc",

-          "attr",

-          "podman"],

- 

-     "packages-aarch64": ["grub2-efi", "ostree-grub2",

-                          "efibootmgr", "shim", "atomic-devmode",

-                          "uboot-tools", "uboot-images-armv8", "bcm283x-firmware"],

- 

-     "packages-armhfp": ["extlinux-bootloader"],

- 

-     "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],

- 

-     "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],

- 

-     "packages-s390x": ["s390utils-base"],

- 

-     "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",

-                          "efibootmgr", "shim", "atomic-devmode",

-                          "microcode_ctl"],

- 

-     "default_target": "multi-user.target",

- 

-     "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"]

- }

file removed
-24
@@ -1,24 +0,0 @@ 

- # The canonical version of this is in https://pagure.io/fedora-atomic

- # Suppress most build root processing we are just carrying

- # binary data.

- %global __os_install_post /usr/lib/rpm/brp-compress %{nil}

- Name: fedora-atomic-host

- Version:	%{ostree_version}

- Release:	1%{?dist}

- Summary:	Image (rpm-ostree rojig) for Fedora Atomic Host

- License:	MIT

- #@@@rpmostree_rojig_meta@@@

- 

- %description

- %{summary}

- 

- %prep

- 

- %build

- 

- %install

- mkdir -p %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}

- for x in *; do mv ${x} %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}; done

- 

- %files

- %{_prefix}/lib/ostree-jigdo/%{name}

@@ -0,0 +1,168 @@ 

+ ref: "fedora/rawhide/${basearch}/atomic-host"

+ rojig:

+   name: fedora-atomic-host

+   summary: "Fedora Atomic Host base image"

+   license: MIT

+ 

+ repos:

+   - fedora-rawhide

+ 

+ documentation: false

+ 

+ automatic_version_prefix: "29"

+ mutate-os-release: "29"

+ 

+ initramfs-args:

+   - "--no-hostonly"

+   - "--add"

+   - "iscsi"

+ boot_location: "new"

+ 

+ install-langs:

+   - "pt_BR"

+   - "fr"

+   - "fr_FR"

+   - "de"

+   - "de_DE"

+   - "it"

+   - "it_IT"

+   - "ru"

+   - "ru_RU"

+   - "es"

+   - "es_ES"

+   - "en_US"

+   - "zh_CN"

+   - "ja"

+   - "ja_JP"

+   - "ko"

+   - "ko_KR"

+   - "zh_TW"

+   - "as"

+   - "as_IN"

+   - "bn"

+   - "bn_IN"

+   - "gu"

+   - "gu_IN"

+   - "hi"

+   - "hi_IN"

+   - "kn"

+   - "kn_IN"

+   - "ml"

+   - "ml_IN"

+   - "mr"

+   - "mr_IN"

+   - "or"

+   - "or_IN"

+   - "pa"

+   - "pa_IN"

+   - "ta"

+   - "ta_IN"

+   - "te"

+   - "te_IN"

+ 

+ postprocess-script: "treecompose-post.sh"

+ 

+ etc-group-members:

+   - "wheel"

+   - "docker"

+ 

+ ignore-removed-users:

+   - "root"

+ ignore-removed-groups:

+   - "root"

+ check-passwd:

+   type: "file"

+   filename: "passwd" 

+ check-groups:

+   "type": "file"

+   "filename": "group"

+ 

+ packages:

+   - atomic

+   - glibc nss-altfiles shadow-utils

+   - sssd-client libsss_sudo

+   - fedora-release-atomichost

+   - dracut-config-generic kernel

+   - dracut-network

+   - rpm-ostree lvm2

+   - chrony

+   - cryptsetup

+   - authconfig

+   - btrfs-progs e2fsprogs xfsprogs

+   - gnupg2

+   - basesystem

+   - python

+   - bash

+   - xz gzip bzip2

+   - coreutils

+   - bridge-utils

+   - which

+   - nfs-utils

+   - curl

+   - iptables-services iptables firewalld

+   - NetworkManager

+   - dnsmasq

+   - hostname initscripts iproute iputils less

+   - sos

+   - openssh-clients openssh-server passwd

+   - policycoreutils procps-ng rootfiles rpm

+   - selinux-policy-targeted setup shadow-utils

+   - sudo systemd systemd-container

+   - util-linux vim-minimal

+   - less

+   - tar

+   - cloud-init

+   - cloud-utils-growpart

+   - rsync

+   - bash-completion

+   - tmux screen

+   - strace lsof tcpdump nmap-ncat

+   - policycoreutils-python

+   - policycoreutils-python-utils

+   - setools-console

+   - audit

+   - cockpit-bridge

+   - cockpit-system

+   - cockpit-docker

+   - cockpit-networkmanager

+   - cockpit-ostree

+   - docker

+   - python-docker

+   - iscsi-initiator-utils

+   - glusterfs glusterfs-fuse

+   - ceph-common

+   - oddjob-mkhomedir

+   - oci-systemd-hook

+   - mdadm

+   - runc

+   - attr

+   - podman

+ 

+ packages-aarch64:

+   - grub2-efi ostree-grub2

+   - efibootmgr shim atomic-devmode

+   - uboot-tools uboot-images-armv8 bcm283x-firmware

+ 

+ packages-armhfp:

+   - extlinux-bootloader

+ 

+ packages-ppc64:

+   - grub2 ostree-grub2 atomic-devmode

+ 

+ packages-ppc64le:

+   - grub2 ostree-grub2 atomic-devmode

+ 

+ packages-s390x:

+   - s390utils-base

+ 

+ packages-x86_64:

+   - grub2 grub2-efi-x64 ostree-grub2

+   - efibootmgr shim atomic-devmode

+   - microcode_ctl

+ 

+ default_target: "multi-user.target"

+ 

+ units:

+   - docker.service

+   - cockpit.socket

+   - docker-storage-setup.service

To merge after the next rpm-ostree release. At some point
after we merge this I'll go through and add some comments (particularly
to the packages section).

rebased onto ad16b09

5 years ago

Ok, rpm-ostree release is done. Now - the problem here is that I believe pungi is not ready for YAML. /cc @dustymabe

Do we:

0) Change pungi (I don't know how hard this would be)
1) Don't try to change fedora-atomic, create a new fedora-coreos repo that starts in YAML, doesn't use pungi, instead jenkins + coreos-assembler
2) Something else?