Use correct version for builds now that Origin builds real RPMs

Drop old settings, standardize a lot of our scripts.

Author: smarterclayton

cluster/bin/local.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -euo pipefail
+
+ctr=gce-build-"$( date +%Y%m%d-%H%M%S )"
+
+function cleanup() {
+  docker kill $ctr &>/dev/null || true
+  docker rm $ctr &>/dev/null || true
+}
+trap cleanup EXIT
+cleanup
+
+# start a container with the custom playbook inside it
+opts="--mode=ug+rwX --owner=0 --group=0"
+args=""
+if [[ -n "${OPENSHIFT_ANSIBLE_REPO-}" ]]; then
+  docker volume rm $ctr-volume &>/dev/null || true
+  docker volume create --name $ctr-volume >/dev/null
+  args="-v $ctr-volume:/usr/share/ansible/openshift-ansible "
+fi
+
+if [[ $# -eq 0 ]]; then
+  args+="-it "
+  docker create --name "$ctr" -e "INSTANCE_PREFIX=${INSTANCE_PREFIX}" -e "OPENSHIFT_ANSIBLE_COMMIT=${OPENSHIFT_ANSIBLE_COMMIT-}" $args "${OPENSHIFT_ANSIBLE_IMAGE:-openshift/origin-gce:latest}" /bin/bash >/dev/null
+else
+  docker create --name "$ctr" -e "INSTANCE_PREFIX=${INSTANCE_PREFIX}" -e "OPENSHIFT_ANSIBLE_COMMIT=${OPENSHIFT_ANSIBLE_COMMIT-}" $args "${OPENSHIFT_ANSIBLE_IMAGE:-openshift/origin-gce:latest}" "$@" >/dev/null
+fi
+
+tar ${opts} -c . | docker cp - $ctr:/usr/share/ansible/openshift-ansible-gce/playbooks/files
+if [[ -n "${OPENSHIFT_ANSIBLE_REPO-}" ]]; then
+  tar ${opts} -c -C "${OPENSHIFT_ANSIBLE_REPO}" . | docker cp - $ctr:/usr/share/ansible/openshift-ansible/
+fi
+
+if [[ $# -eq 0 ]]; then
+  docker start -ai "${ctr}"
+else
+  docker start -a "${ctr}"
+fi
+docker cp "$ctr":/tmp/admin.kubeconfig admin.kubeconfig &>/dev/null || true

cluster/bin/run.sh

@@ -1,6 +1,6 @@
 # Deploy the OpenShift CI instance to GCE
 
-    $ ../bin/run.sh
+    $ ../bin/local.sh
     $ export PR_REPO_URL=<a yum repo base URL containing OpenShift RPMs>
     $ ansible-playbook playbooks/provision.yaml
 

cluster/ci/README.md

@@ -0,0 +1,43 @@
+# Deploy OpenShift for e2e testing on GCE
+
+Standard setup for an e2e test environment on GCE is provided in this directory. The data directory
+should have:
+
+* `gce.json` containing the GCE service account credentials to use that have permission to create instances, networks, and a bucket in project `openshift-gce-devel-ci`
+* `ops-mirror.pem` containing the client certificate for the OpenShift ops mirror
+* `ssh-privatekey` (optional) with the private key to use for the GCE instances
+* `ssh-publickey` (optional) a key to use with the above private key
+
+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.
+
+```
+$ cd data
+
+# launch cluster
+$ INSTANCE_PREFIX=pr345 ../../bin/local.sh ansible-playbook \
+    -e openshift_test_repo=https://storage.googleapis.com/origin-ci-test/pr-logs/12940/test_pull_requests_origin_gce/559/artifacts/rpms \
+    playbooks/launch.yaml
+
+# 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
+
+# get a shell in the ansible environment
+$ INSTANCE_PREFIX=pr345 ../../bin/local.sh
+```
+
+The following ansible variables are commonly used:
+
+* `openshift_test_repo` is the URL to a yum repo to use to install
+* `openshift_image_tag` (optional) is the suffix of the image to run with
+* `openshift_pkg_version` (optional) is the exact package value to use `-0.0.1` if installing RPMs that don't match the desired version
+
+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
+

cluster/test-deploy/README.md

@@ -1,3 +1,3 @@
 *
 !.gitignore
-!ansible-config.yml
+!vars.yml

cluster/test-deploy/data/.gitignore

@@ -3,33 +3,28 @@
 deployment_type: origin
 ansible_pkg_mgr: yum
 
-# for initial install
-openshift_pkg_version: "-{{ ansible_env.PR_REPO_VERSION | default('0.0.1') }}" # try to remove
 openshift_additional_repos: [
-  {'id': 'origin-pr', 'baseurl': '{{ lookup("env", "PR_REPO_URL") }}', 'enabled': 1, 'gpgcheck': 0},
+  {'id': 'origin-pr', 'baseurl': '{{ openshift_test_repo }}', 'enabled': 1, 'gpgcheck': 0},
   {'id': 'origin-pr-dependencies', 'baseurl': 'http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-future/', 'enabled': 1, 'gpgcheck': 0}
   ]
-openshift_version: 1.4.0 # work around 1.5 not being a valid option yet
-openshift_image_tag: v1.5.0-alpha.2 # necessary for upgrade?
-openshift_enable_origin_repo: false # must be true for upgrade
 
 # for upgrading
-#openshift_pkg_version: "-1.3.1"
-#openshift_version: 1.4.0 # work around 1.5 not being a valid option
-#docker_upgrade: false
-#openshift_enable_origin_repo: true
+# openshift_pkg_version: "-1.3.1"
+# openshift_version: 1.4.0 # work around 1.5 not being a valid option
+# docker_upgrade: false
+# openshift_enable_origin_repo: true
 
 # URLs and certs
 
-provision_prefix: ci-{{ lookup('env', 'PR_NUMBER') | mandatory }}-
-gce_network_name: "ci-{{ lookup('env', 'PR_NUMBER') | mandatory }}-ocp-network"
+provision_prefix: ci-{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}-
+gce_network_name: "ci-{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}-ocp-network"
 
-provision_gce_registry_gcs_bucket: origin-ci-test-{{ lookup('env', 'PR_NUMBER') | mandatory }}
-openshift_master_cluster_public_hostname: api.{{ lookup('env', 'PR_NUMBER') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
-openshift_master_cluster_hostname: internal-api.{{ lookup('env', 'PR_NUMBER') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
-wildcard_zone: apps.{{ lookup('env', 'PR_NUMBER') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
-openshift_master_public_api_url: "https://api.{{ lookup('env', 'PR_NUMBER') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com/"
-openshift_master_public_console_url: "https://api.{{ lookup('env', 'PR_NUMBER') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com/console"
+provision_gce_registry_gcs_bucket: origin-ci-test-{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}
+openshift_master_cluster_public_hostname: api.{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
+openshift_master_cluster_hostname: internal-api.{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
+wildcard_zone: apps.{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com
+openshift_master_public_api_url: "https://api.{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com/"
+openshift_master_public_console_url: "https://api.{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}.origin-ci-int-gce.dev.rhcloud.com/console"
 
 public_hosted_zone: origin-ci-int-gce.dev.rhcloud.com
 dns_managed_zone: origin-ci-int-gce
@@ -84,7 +79,6 @@ provision_gce_instance_group_size_node: 3
 provision_gce_disk_size_node_docker: 75
 provision_gce_disk_size_node_openshift: 50
 
-provision_rh_channel_version: "3.3"
 provision_gce_gcloud_version: '130.0.0'
 
 # An image or image family to pull from
@@ -136,4 +130,4 @@ provision_custom_repositories: [
     "gpgcheck": 1,
     "gpgkey": "https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted"
   }
-]
+]