From 5d10aef60754e49de0a5e3548ff16af0cb5b3d8a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 26 Apr 2017 09:39:20 -0400 Subject: redhat-ci: use requirements.txt Use requirements.txt rather than hardcoding the ansible version here. Also update the comment re. `rpm-ostree status`. --- .redhat-ci.sh | 5 ++--- .redhat-ci.yml | 2 +- 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/ -- cgit v1.2.3