From e667ff29bbb302c5a60936be8db2726eb212b425 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Mar 08 2018 10:42:04 +0000
Subject: Split out updates-testing and -stable and -base


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-atomic-host-base.json b/fedora-atomic-host-base.json
new file mode 100644
index 0000000..aea8d41
--- /dev/null
+++ b/fedora-atomic-host-base.json
@@ -0,0 +1,148 @@
+{
+    "ref": "fedora/28/${basearch}/atomic-host",
+    "ex-jigdo-spec": "fedora-atomic-host.spec",
+
+    "repos": ["fedora-28", "fedora-28-updates"],
+
+    "selinux": true,
+
+    "documentation": false,
+
+    "automatic_version_prefix": "28",
+    "mutate-os-release": "28",
+
+    "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", "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-register-machine",
+         "oci-systemd-hook",
+         "mdadm",
+         "runc",
+         "attr"],
+
+    "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"]
+}
diff --git a/fedora-atomic-host-updates-stable.json b/fedora-atomic-host-updates-stable.json
new file mode 100644
index 0000000..e3af0c2
--- /dev/null
+++ b/fedora-atomic-host-updates-stable.json
@@ -0,0 +1,5 @@
+{
+    "ref": "fedora/28/${basearch}/updates/atomic-host",
+    "ex-jigdo-spec": "fedora-atomic-host.spec",
+    "include": "fedora-atomic-host-base.json"
+}
diff --git a/fedora-atomic-host-updates-testing.json b/fedora-atomic-host-updates-testing.json
new file mode 100644
index 0000000..f0fe402
--- /dev/null
+++ b/fedora-atomic-host-updates-testing.json
@@ -0,0 +1,5 @@
+{
+    "ref": "fedora/28/${basearch}/testing/atomic-host",
+    "ex-jigdo-spec": "fedora-atomic-host.spec",
+    "include": "fedora-atomic-host-base.json"
+}
diff --git a/fedora-atomic-host.json b/fedora-atomic-host.json
index aea8d41..ccae3e0 100644
--- a/fedora-atomic-host.json
+++ b/fedora-atomic-host.json
@@ -1,148 +1,6 @@
 {
     "ref": "fedora/28/${basearch}/atomic-host",
     "ex-jigdo-spec": "fedora-atomic-host.spec",
-
     "repos": ["fedora-28", "fedora-28-updates"],
-
-    "selinux": true,
-
-    "documentation": false,
-
-    "automatic_version_prefix": "28",
-    "mutate-os-release": "28",
-
-    "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", "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-register-machine",
-         "oci-systemd-hook",
-         "mdadm",
-         "runc",
-         "attr"],
-
-    "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"]
+    "include": "fedora-atomic-host-base.json"
 }

