From 960aa2af3863b8ca4f73bb065d7b98410e20366d Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sun, 27 Aug 2017 20:51:58 -0400
Subject: [PATCH] Add a new perf runner and cleanup readme

---
 cluster/test-deploy/README.md     | 21 +++++++++++----------
 cluster/test-perf/.gitignore      |  1 +
 cluster/test-perf/Makefile        |  1 +
 cluster/test-perf/README.md       |  3 +++
 cluster/test-perf/data/.gitignore |  3 +++
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 cluster/test-perf/.gitignore
 create mode 120000 cluster/test-perf/Makefile
 create mode 100644 cluster/test-perf/README.md
 create mode 100644 cluster/test-perf/data/.gitignore

diff --git a/cluster/test-deploy/README.md b/cluster/test-deploy/README.md
index d9ccf9a3e4a41..123d8892c2674 100644
--- a/cluster/test-deploy/README.md
+++ b/cluster/test-deploy/README.md
@@ -10,24 +10,26 @@ should have:
 
 See `data/vars.yaml` for the default settings.  This depends on the `openshift/origin-gce:latest` image
 which is a pre-built version of the GCE reference architecture and the openshift-ansible playbooks for the
-appropriate release.
+appropriate release. That image is built from https://github.com/openshift/origin-gce.
 
-```
-$ cd data
+Other prerequisites:
+
+* Docker 1.12+ installed and available
+* Your system time must be up to date in order for gcloud to
+  authenticate to GCE (run `sudo ntpd -gq` in your VM if necessary)
 
-# launch cluster
-$ INSTANCE_PREFIX=pr345 ../../bin/local.sh ansible-playbook \
-    -e openshift_test_repo=$( curl https://storage.googleapis.com/origin-ci-test/branch-logs/origin/master/builds/.latest )/artifacts/rpms \
-    playbooks/launch.yaml
+```
+# launch cluster using the latest RPMs
+$ make WHAT=mycluster up
 
 # after cluster is launched, admin.kubeconfig is copied locally
 $ KUBECONFIG=admin.kubeconfig oc status
 
 # teardown cluster
-$ INSTANCE_PREFIX=pr345 ../../bin/local.sh ansible-playbook playbooks/terminate.yaml
+$ make WHAT=mycluster down
 
 # get a shell in the ansible environment
-$ INSTANCE_PREFIX=pr345 ../../bin/local.sh
+$ make WHAT=mycluster sh
 ```
 
 The following ansible variables are commonly used:
@@ -38,6 +40,5 @@ The following ansible variables are commonly used:
 
 The following environment variables can be provided
 
-* `INSTANCE_PREFIX` is a value that should be unique across all clusters running in the project. It is provided as an env var to allow inventory to be calculated by Ansible.
 * `OPENSHIFT_ANSIBLE_IMAGE` (defaults to `openshift/origin-gce:latest`) the image to deploy from
 
diff --git a/cluster/test-perf/.gitignore b/cluster/test-perf/.gitignore
new file mode 100644
index 0000000000000..295e507ce9dde
--- /dev/null
+++ b/cluster/test-perf/.gitignore
@@ -0,0 +1 @@
+admin.kubeconfig
diff --git a/cluster/test-perf/Makefile b/cluster/test-perf/Makefile
new file mode 120000
index 0000000000000..00e295cec08dc
--- /dev/null
+++ b/cluster/test-perf/Makefile
@@ -0,0 +1 @@
+../test-deploy/Makefile
\ No newline at end of file
diff --git a/cluster/test-perf/README.md b/cluster/test-perf/README.md
new file mode 100644
index 0000000000000..1318b4f0efe7f
--- /dev/null
+++ b/cluster/test-perf/README.md
@@ -0,0 +1,3 @@
+# OpenShift performance e2e cluster
+
+See [the e2e README](../test-deploy/README.md) for instructions.
diff --git a/cluster/test-perf/data/.gitignore b/cluster/test-perf/data/.gitignore
new file mode 100644
index 0000000000000..4bfa3c666b81c
--- /dev/null
+++ b/cluster/test-perf/data/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!vars.yml