From b122e6a655a3a9807ea38741bfc6be6cc5f28436 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 13 Jun 2017 11:51:23 -0400 Subject: papr: add documentation to YAML and simplify context Don't duplicate the actual image tag used in the context. Just print it in the logs instead. That way there's no risk of it being outdated when we bump the tag in the YAML. --- .papr.sh | 2 ++ .papr.yml | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.papr.sh b/.papr.sh index aedf2527b..fe0b97b68 100755 --- a/.papr.sh +++ b/.papr.sh @@ -1,6 +1,8 @@ #!/bin/bash set -xeuo pipefail +echo "Targeting OpenShift Origin $OPENSHIFT_IMAGE_TAG" + pip install -r requirements.txt # ping the nodes to check they're responding and register their ostree versions diff --git a/.papr.yml b/.papr.yml index eec0f76ec..16d6e78b1 100644 --- a/.papr.yml +++ b/.papr.yml @@ -1,5 +1,16 @@ --- +# This YAML file is used by PAPR. It details the test +# environment to provision and the test procedure. For more +# information on PAPR, see: +# +# https://github.com/projectatomic/papr +# +# The PAPR YAML specification detailing allowed fields can +# be found at: +# +# https://github.com/projectatomic/papr/blob/master/sample.papr.yml + cluster: hosts: - name: ocp-master @@ -19,7 +30,7 @@ packages: - openssl-devel - redhat-rpm-config -context: 'fedora/25/atomic | origin/v3.6.0-alpha.1' +context: 'fedora/25/atomic' env: OPENSHIFT_IMAGE_TAG: v3.6.0-alpha.1 -- cgit v1.2.3