diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-26 02:50:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 02:50:56 -0500 |
| commit | 5f49e91b5419e7491a4df1d0b0f217bfb0ff97b9 (patch) | |
| tree | 9a3c018d5cb1129ceb7944734d5bc8eec274e36e | |
| parent | c12b00944940cd7f425323e1598a4b7683ddaf75 (diff) | |
| parent | 701ee1badf31fe9a2504bb53563c76da1fbdc880 (diff) | |
| download | openshift-5f49e91b5419e7491a4df1d0b0f217bfb0ff97b9.tar.gz openshift-5f49e91b5419e7491a4df1d0b0f217bfb0ff97b9.tar.bz2 openshift-5f49e91b5419e7491a4df1d0b0f217bfb0ff97b9.tar.xz openshift-5f49e91b5419e7491a4df1d0b0f217bfb0ff97b9.zip | |
Merge pull request #4005 from jlebon/pr/rhci-journals
Merged by openshift-bot
| -rwxr-xr-x | .redhat-ci.sh | 29 | ||||
| -rw-r--r-- | .redhat-ci.yml | 25 |
2 files changed, 34 insertions, 20 deletions
diff --git a/.redhat-ci.sh b/.redhat-ci.sh new file mode 100755 index 000000000..29d64e4d5 --- /dev/null +++ b/.redhat-ci.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -xeuo pipefail + +# F25 currently has 2.2.1, so install from pypi +pip install ansible==2.2.2.0 + +# do a simple ping to make sure the nodes are available +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 index d9849ed60..887cc6ef0 100644 --- a/.redhat-ci.yml +++ b/.redhat-ci.yml @@ -18,28 +18,13 @@ packages: - openssl-devel - redhat-rpm-config -context: 'fedora/25/atomic | origin/v1.5.0-rc.0' +context: 'fedora/25/atomic | origin/v3.6.0-alpha.1' env: - OPENSHIFT_IMAGE_TAG: v1.5.0-rc.0 + OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.1 tests: - - pip install ansible==2.2.2.0 # F25 currently has 2.2.1, so install from pypi - - ansible -vvv -i .redhat-ci.inventory nodes -a 'rpm-ostree status' - - 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\""' + - sh .redhat-ci.sh ---- - -inherit: true - -context: 'fedora/25/atomic | origin/v3.6.0-alpha.0' - -env: - OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.0 +artifacts: + - journals/ |