From 18644c77be32ff6adf385c4b1fde18f7d66312d6 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 13 Jun 2017 09:54:06 -0400 Subject: papr: rename redhat-ci related files to papr The project was renamed to PAPR, see: https://github.com/projectatomic/papr --- .papr.inventory | 23 +++++++++++++++++++++++ .papr.sh | 28 ++++++++++++++++++++++++++++ .papr.yml | 30 ++++++++++++++++++++++++++++++ .redhat-ci.inventory | 23 ----------------------- .redhat-ci.sh | 28 ---------------------------- .redhat-ci.yml | 30 ------------------------------ 6 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 .papr.inventory create mode 100755 .papr.sh create mode 100644 .papr.yml delete mode 100644 .redhat-ci.inventory delete mode 100755 .redhat-ci.sh delete mode 100644 .redhat-ci.yml diff --git a/.papr.inventory b/.papr.inventory new file mode 100644 index 000000000..23bc9923c --- /dev/null +++ b/.papr.inventory @@ -0,0 +1,23 @@ +[OSEv3:children] +masters +nodes +etcd + +[OSEv3:vars] +ansible_ssh_user=root +ansible_python_interpreter=/usr/bin/python3 +deployment_type=origin +openshift_image_tag="{{ lookup('env', 'OPENSHIFT_IMAGE_TAG') }}" +openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_node1_IP') }}.xip.io" +openshift_check_min_host_memory_gb=1.9 + +[masters] +ocp-master + +[etcd] +ocp-master + +[nodes] +ocp-master openshift_schedulable=false +ocp-node1 openshift_node_labels="{'region':'infra'}" +ocp-node2 openshift_node_labels="{'region':'infra'}" diff --git a/.papr.sh b/.papr.sh new file mode 100755 index 000000000..aedf2527b --- /dev/null +++ b/.papr.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -xeuo pipefail + +pip install -r requirements.txt + +# ping the nodes to check they're responding and register their ostree versions +ansible -vvv -i .papr.inventory nodes -a 'rpm-ostree status' + +upload_journals() { + mkdir journals + for node in master node1 node2; do + ssh ocp-$node 'journalctl --no-pager || true' > journals/ocp-$node.log + done +} + +trap upload_journals ERR + +# run the actual installer +ansible-playbook -vvv -i .papr.inventory playbooks/byo/config.yml + +# run a small subset of origin conformance tests to sanity +# check the cluster NB: we run it on the master since we may +# be in a different OSP network +ssh ocp-master docker run --rm --net=host --privileged \ + -v /etc/origin/master/admin.kubeconfig:/config fedora:25 sh -c \ + '"dnf install -y origin-tests && \ + KUBECONFIG=/config /usr/libexec/origin/extended.test --ginkgo.v=1 \ + --ginkgo.noColor --ginkgo.focus=\"Services.*NodePort|EmptyDir\""' diff --git a/.papr.yml b/.papr.yml new file mode 100644 index 000000000..c29f4b5c9 --- /dev/null +++ b/.papr.yml @@ -0,0 +1,30 @@ +--- + +cluster: + hosts: + - name: ocp-master + distro: fedora/25/atomic + - name: ocp-node1 + distro: fedora/25/atomic + - name: ocp-node2 + distro: fedora/25/atomic + container: + image: fedora:25 + +packages: + - gcc + - python-pip + - python-devel + - openssl-devel + - redhat-rpm-config + +context: 'fedora/25/atomic | origin/v3.6.0-alpha.1' + +env: + OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.1 + +tests: + - ./.papr.sh + +artifacts: + - journals/ diff --git a/.redhat-ci.inventory b/.redhat-ci.inventory deleted file mode 100644 index 23bc9923c..000000000 --- a/.redhat-ci.inventory +++ /dev/null @@ -1,23 +0,0 @@ -[OSEv3:children] -masters -nodes -etcd - -[OSEv3:vars] -ansible_ssh_user=root -ansible_python_interpreter=/usr/bin/python3 -deployment_type=origin -openshift_image_tag="{{ lookup('env', 'OPENSHIFT_IMAGE_TAG') }}" -openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_node1_IP') }}.xip.io" -openshift_check_min_host_memory_gb=1.9 - -[masters] -ocp-master - -[etcd] -ocp-master - -[nodes] -ocp-master openshift_schedulable=false -ocp-node1 openshift_node_labels="{'region':'infra'}" -ocp-node2 openshift_node_labels="{'region':'infra'}" diff --git a/.redhat-ci.sh b/.redhat-ci.sh deleted file mode 100755 index fce8c1d52..000000000 --- a/.redhat-ci.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -xeuo pipefail - -pip install -r requirements.txt - -# ping the nodes to check they're responding and register their ostree versions -ansible -vvv -i .redhat-ci.inventory nodes -a 'rpm-ostree status' - -upload_journals() { - mkdir journals - for node in master node1 node2; do - ssh ocp-$node 'journalctl --no-pager || true' > journals/ocp-$node.log - done -} - -trap upload_journals ERR - -# run the actual installer -ansible-playbook -vvv -i .redhat-ci.inventory playbooks/byo/config.yml - -# run a small subset of origin conformance tests to sanity -# check the cluster NB: we run it on the master since we may -# be in a different OSP network -ssh ocp-master docker run --rm --net=host --privileged \ - -v /etc/origin/master/admin.kubeconfig:/config fedora:25 sh -c \ - '"dnf install -y origin-tests && \ - KUBECONFIG=/config /usr/libexec/origin/extended.test --ginkgo.v=1 \ - --ginkgo.noColor --ginkgo.focus=\"Services.*NodePort|EmptyDir\""' diff --git a/.redhat-ci.yml b/.redhat-ci.yml deleted file mode 100644 index 6dac7b256..000000000 --- a/.redhat-ci.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- - -cluster: - hosts: - - name: ocp-master - distro: fedora/25/atomic - - name: ocp-node1 - distro: fedora/25/atomic - - name: ocp-node2 - distro: fedora/25/atomic - container: - image: fedora:25 - -packages: - - gcc - - python-pip - - python-devel - - openssl-devel - - redhat-rpm-config - -context: 'fedora/25/atomic | origin/v3.6.0-alpha.1' - -env: - OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.1 - -tests: - - ./.redhat-ci.sh - -artifacts: - - journals/ -- cgit v1.2.1