Merge pull request coreos#2 from cgwalters/duality

Make CentOS a build-time option again

Dockerfile

@@ -17,8 +17,8 @@ RUN cd /srv/tree/ && mkdir build-repo && \
 FROM base
 
 RUN cd /srv/tree && \
-    rpm-ostree compose tree --repo=/srv/tree/build-repo host.json && \
-    ostree --repo=repo pull-local build-repo openshift/3.10/x86_64/os && \
+    rpm-ostree compose tree --repo=/srv/tree/build-repo host-origin.json && \
+    ostree --repo=repo pull-local build-repo && \
     ostree --repo=repo summary -u && \
     rm -rf build-repo
 

README.md

@@ -25,8 +25,8 @@ $ xfs_growfs /
 
 ```
 $ docker run --network host -d -w /srv/tree/repo $REGISTRY/os:latest
-$ ostree remote add --no-gpg-verify local http://localhost:8080 openshift/3.10/x86_64/os
-$ rpm-ostree rebase -r local:openshift/3.10/x86_64/os
+$ ostree remote add --no-gpg-verify local http://localhost:8080 origin/3.10/x86_64/os
+$ rpm-ostree rebase -r local:origin/3.10/x86_64/os
 
 # wait, SSH back in
 $ openshift version
@@ -39,8 +39,8 @@ $ kubectl run os-content --image=$REGISTRY/os:latest
 $ kubectl expose os-content --port 8080
 
 $ ssh root@NODE_HOST
-$ ostree remote add --no-gpg-verify local http://os-content.namespace.svc:8080 openshift/3.10/x86_64/os
-$ rpm-ostree rebase -r local:openshift/3.10/x86_64/os
+$ ostree remote add --no-gpg-verify local http://os-content.namespace.svc:8080 origin/3.10/x86_64/os
+$ rpm-ostree rebase -r local:origin/3.10/x86_64/os
 
 # wait, SSH back in
 $ openshift version

RPM-GPG-KEY-CentOS-7

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBFOn/0sBEADLDyZ+DQHkcTHDQSE0a0B2iYAEXwpPvs67cJ4tmhe/iMOyVMh9
+Yw/vBIF8scm6T/vPN5fopsKiW9UsAhGKg0epC6y5ed+NAUHTEa6pSOdo7CyFDwtn
+4HF61Esyb4gzPT6QiSr0zvdTtgYBRZjAEPFVu3Dio0oZ5UQZ7fzdZfeixMQ8VMTQ
+4y4x5vik9B+cqmGiq9AW71ixlDYVWasgR093fXiD9NLT4DTtK+KLGYNjJ8eMRqfZ
+Ws7g7C+9aEGHfsGZ/SxLOumx/GfiTloal0dnq8TC7XQ/JuNdB9qjoXzRF+faDUsj
+WuvNSQEqUXW1dzJjBvroEvgTdfCJfRpIgOrc256qvDMp1SxchMFltPlo5mbSMKu1
+x1p4UkAzx543meMlRXOgx2/hnBm6H6L0FsSyDS6P224yF+30eeODD4Ju4BCyQ0jO
+IpUxmUnApo/m0eRelI6TRl7jK6aGqSYUNhFBuFxSPKgKYBpFhVzRM63Jsvib82rY
+438q3sIOUdxZY6pvMOWRkdUVoz7WBExTdx5NtGX4kdW5QtcQHM+2kht6sBnJsvcB
+JYcYIwAUeA5vdRfwLKuZn6SgAUKdgeOtuf+cPR3/E68LZr784SlokiHLtQkfk98j
+NXm6fJjXwJvwiM2IiFyg8aUwEEDX5U+QOCA0wYrgUQ/h8iathvBJKSc9jQARAQAB
+tEJDZW50T1MtNyBLZXkgKENlbnRPUyA3IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
+c2VjdXJpdHlAY2VudG9zLm9yZz6JAjUEEwECAB8FAlOn/0sCGwMGCwkIBwMCBBUC
+CAMDFgIBAh4BAheAAAoJECTGqKf0qA61TN0P/2730Th8cM+d1pEON7n0F1YiyxqG
+QzwpC2Fhr2UIsXpi/lWTXIG6AlRvrajjFhw9HktYjlF4oMG032SnI0XPdmrN29lL
+F+ee1ANdyvtkw4mMu2yQweVxU7Ku4oATPBvWRv+6pCQPTOMe5xPG0ZPjPGNiJ0xw
+4Ns+f5Q6Gqm927oHXpylUQEmuHKsCp3dK/kZaxJOXsmq6syY1gbrLj2Anq0iWWP4
+Tq8WMktUrTcc+zQ2pFR7ovEihK0Rvhmk6/N4+4JwAGijfhejxwNX8T6PCuYs5Jiv
+hQvsI9FdIIlTP4XhFZ4N9ndnEwA4AH7tNBsmB3HEbLqUSmu2Rr8hGiT2Plc4Y9AO
+aliW1kOMsZFYrX39krfRk2n2NXvieQJ/lw318gSGR67uckkz2ZekbCEpj/0mnHWD
+3R6V7m95R6UYqjcw++Q5CtZ2tzmxomZTf42IGIKBbSVmIS75WY+cBULUx3PcZYHD
+ZqAbB0Dl4MbdEH61kOI8EbN/TLl1i077r+9LXR1mOnlC3GLD03+XfY8eEBQf7137
+YSMiW5r/5xwQk7xEcKlbZdmUJp3ZDTQBXT06vavvp3jlkqqH9QOE8ViZZ6aKQLqv
+pL+4bs52jzuGwTMT7gOR5MzD+vT0fVS7Xm8MjOxvZgbHsAgzyFGlI1ggUQmU7lu3
+uPNL0eRx4S1G4Jn5
+=OGYX
+-----END PGP PUBLIC KEY BLOCK-----

centos.repo

@@ -0,0 +1,60 @@
+
+[CentOS-Base]
+name=CentOS-Base
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=os&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+exclude=cloud-utils-growpart
+
+[CentOS-extras]
+name=CentOS-$releasever - Extras
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=extras&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+exclude=cloud-utils-growpart
+
+#released updates 
+[CentOS-updates]
+name=CentOS-releasever - Updates
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=updates&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+exclude=cloud-utils-growpart
+
+# CentOS-CR.repo
+#
+# The Continuous Release ( CR )  repository contains rpms that are due in the next
+# release for a specific CentOS Version ( eg. next release in CentOS-7 ); these rpms
+# are far less tested, with no integration checking or update path testing having
+# taken place. They are still built from the upstream sources, but might not map 
+# to an exact upstream distro release.
+#
+# These packages are made available soon after they are built, for people willing 
+# to test their environments, provide feedback on content for the next release, and
+# for people looking for early-access to next release content.
+#
+# The CR repo is shipped in a disabled state by default; its important that users 
+# understand the implications of turning this on. 
+#
+# NOTE: We do not use a mirrorlist for the CR repos, to ensure content is available
+#       to everyone as soon as possible, and not need to wait for the external
+#       mirror network to seed first. However, many local mirrors will carry CR repos
+#       and if desired you can use one of these local mirrors by editing the baseurl
+#       line in the repo config below.
+#
+
+[CentOS-CR]
+name=CentOS-7 - cr
+baseurl=http://mirror.centos.org/centos/7/cr/$basearch/
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[rhel-atomic-rebuild]
+name=rhel-atomic-rebuild
+baseurl=http://mirror.centos.org/centos/7/atomic/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7

host.json → host-base.json

@@ -3,10 +3,6 @@
     "osname": "openshift-host",
     "ref": "openshift/3.10/x86_64/os",
     "repos": [
-        "rhel-7.5-server",
-        "rhel-7.5-server-optional",
-        "rhel-7.5-server-extras",
-        "rhel-7.5-atomic",
         "ostree-master",
         "origin-repo",
         "dustymabe-ignition"
@@ -114,8 +110,7 @@
         "sg3_utils",
         "glusterfs-fuse",
         "dnsmasq",
-        "oci-umount",
-        "origin-node"
+        "oci-umount"
     ],
     "remove-from-packages": [
         [

host-origin.json

@@ -0,0 +1,13 @@
+{
+    "include": "host-base.json",
+    "ref": "origin/3.10/x86_64/os",
+    "repos": [
+        "CentOS-Base",
+        "CentOS-updates",
+        "CentOS-extras",
+        "rhel-atomic-rebuild",
+        "CentOS-CR"
+    ],
+    "packages": ["origin-node"],
+    "automatic_version_prefix": "3.10-7.1803"
+}

host-rhcos.json

@@ -0,0 +1,11 @@
+{
+    "include": "host-base.json",
+    "repos": [
+        "rhel-7.5-server",
+        "rhel-7.5-server-optional",
+        "rhel-7.5-server-extras",
+        "rhel-7.5-atomic"
+    ],
+    "packages": ["atomic-openshift-node"],
+    "automatic_version_prefix": "3.10-7.5.0"
+}