From 2a9cc1d706acebd11c6d97cc9ae0660b0d83b571 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 16 May 2018 16:30:17 -0400
Subject: [PATCH] Default to rhcos, move host-origin to contrib/

This will be the focus, let's ensure the `Makefile` defaults
to it.  And since we don't have a lot of bandwidth to maintain
multiple things here, let's move the origin one to contrib/ for now.
---
 Jenkinsfile.cloud                            |  9 +--------
 Jenkinsfile.treecompose                      |  5 +----
 Makefile                                     |  2 +-
 README.md                                    | 15 +++++++--------
 host-origin.json => contrib/host-origin.json |  1 +
 host-base.json                               |  2 +-
 6 files changed, 12 insertions(+), 22 deletions(-)
 rename host-origin.json => contrib/host-origin.json (82%)

diff --git a/Jenkinsfile.cloud b/Jenkinsfile.cloud
index 18c35abe..215e7832 100644
--- a/Jenkinsfile.cloud
+++ b/Jenkinsfile.cloud
@@ -1,14 +1,7 @@
 // this var conveniently refers to a location on the server as well as the local dir we sync to/from
 def output = "${env.ARTIFACT_SERVER_DIR}/images"
 
-def ref
-if (env.BUILD_TYPE == 'origin') {
-    ref = "origin/3.10/x86_64/os"
-} else if (env.BUILD_TYPE == 'rhcos') {
-    ref = "openshift/3.10/x86_64/os"
-} else {
-    assert false
-}
+def ref = "openshift/3.10/x86_64/os";
 
 node(env.NODE) {
     checkout scm
diff --git a/Jenkinsfile.treecompose b/Jenkinsfile.treecompose
index 2d08685e..8a11e592 100644
--- a/Jenkinsfile.treecompose
+++ b/Jenkinsfile.treecompose
@@ -4,10 +4,7 @@ def DOCKER_ARGS = "--net=host -v /srv:/srv --privileged"
 // this var conveniently refers to a location on the server as well as the local dir we sync to/from
 def repo = "${env.ARTIFACT_SERVER_DIR}/repo"
 
-if (env.BUILD_TYPE != 'origin' && env.BUILD_TYPE != 'rhcos') {
-    assert false
-}
-def manifest = "host-${env.BUILD_TYPE}.json"
+def manifest = "host-rhcos.json"
 
 node(env.NODE) {
     checkout scm
diff --git a/Makefile b/Makefile
index 7d429ba5..7cdfd05b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-OS_FLAVOR ?= origin
+OS_FLAVOR ?= rhcos
 # Use for e.g. --cache-only
 COMPOSEFLAGS ?=
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
diff --git a/README.md b/README.md
index 68d14e9e..9ed75d80 100644
--- a/README.md
+++ b/README.md
@@ -11,22 +11,21 @@ $ docker build .
 $ docker push SOME_IMAGE
 ```
 
-Turn a CentOS Atomic AWS AMI booted machine into this OS:
+Turn a [CentOS Atomic](https://wiki.centos.org/SpecialInterestGroup/Atomic/Download) booted machine into this OS:
 
-1. Launch an AMI for CentOS 7 (ami-a06447da) with at least 20GB disk (10GB is too small for now)
+1. Provision a machine (e.g. an `ami-a06447da` in AWS us-east-1) with at least 20GB disk (10GB is too small for now)
 2. Resize the disk:
 
 ```
-$ lvextend -l +25%FREE atomicos/root
-$ xfs_growfs /
+$ lvm lvextend -r -l +25%FREE atomicos/root
 ```
 
 3. SSH to the machine and run:
 
 ```
 $ docker run --network host -d -w /srv/tree/repo $REGISTRY/os:latest
-$ 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
+$ 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
 
 # wait, SSH back in
 $ openshift version
@@ -39,8 +38,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 origin/3.10/x86_64/os
-$ rpm-ostree rebase -r local:origin/3.10/x86_64/os
+$ 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
 
 # wait, SSH back in
 $ openshift version
diff --git a/host-origin.json b/contrib/host-origin.json
similarity index 82%
rename from host-origin.json
rename to contrib/host-origin.json
index 71f52a4f..d8072758 100644
--- a/host-origin.json
+++ b/contrib/host-origin.json
@@ -1,4 +1,5 @@
 {
+    "00comment": "This file isn't maintained anymore",
     "include": "host-base.json",
     "ref": "origin/3.10/x86_64/os",
     "repos": [
diff --git a/host-base.json b/host-base.json
index 0ea54f3f..fad17945 100644
--- a/host-base.json
+++ b/host-base.json
@@ -1,6 +1,6 @@
 {
     "comment": "OpenShift Host",
-    "osname": "openshift-host",
+    "osname": "rhcos",
     "ref": "openshift/3.10/x86_64/os",
     "repos": [
         "atomic-centos-continuous",