summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-03 09:04:03 -0500
committerGitHub <noreply@github.com>2017-05-03 09:04:03 -0500
commit1163633a1de10133f0fca505e88f4d4610314882 (patch)
tree11b99483656c78abdb0efbf8c196ff5908cf1126
parentba5c6594ade6679d055aaecc7c38836444f0f791 (diff)
parent5d10aef60754e49de0a5e3548ff16af0cb5b3d8a (diff)
downloadopenshift-1163633a1de10133f0fca505e88f4d4610314882.tar.gz
openshift-1163633a1de10133f0fca505e88f4d4610314882.tar.bz2
openshift-1163633a1de10133f0fca505e88f4d4610314882.tar.xz
openshift-1163633a1de10133f0fca505e88f4d4610314882.zip
Merge pull request #4011 from jlebon/pr/rhci-fixes
Merged by openshift-bot
-rwxr-xr-x.redhat-ci.sh5
-rw-r--r--.redhat-ci.yml2
2 files changed, 3 insertions, 4 deletions
diff --git a/.redhat-ci.sh b/.redhat-ci.sh
index 29d64e4d5..fce8c1d52 100755
--- a/.redhat-ci.sh
+++ b/.redhat-ci.sh
@@ -1,10 +1,9 @@
#!/bin/bash
set -xeuo pipefail
-# F25 currently has 2.2.1, so install from pypi
-pip install ansible==2.2.2.0
+pip install -r requirements.txt
-# do a simple ping to make sure the nodes are available
+# 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() {
diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 887cc6ef0..6dac7b256 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -24,7 +24,7 @@ env:
OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.1
tests:
- - sh .redhat-ci.sh
+ - ./.redhat-ci.sh
artifacts:
- journals/