Validate grafyaml based on master

Rather than installing grafyaml from pypi, install it with
zuul-cloner so that it may be validated with the contents of
master (or even changes in review).  We run grafyaml continuously
deployed from source rather than installing from pypi, so this
more closely matches what we actually want to validate.

Change-Id: I26663e5c70883b910fced6c32ae364734542b5a5
This commit is contained in:
James E. Blair 2016-01-07 15:24:30 -08:00
parent b70bbeb5c7
commit 9ed42604d0
3 changed files with 50 additions and 2 deletions

View File

@ -1,4 +1,3 @@
hacking>=0.10,<0.11
bashate>=0.2
grafyaml
-e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool

49
tools/grafyaml-validate.sh Executable file
View File

@ -0,0 +1,49 @@
#!/bin/bash -e
# Copyright 2016 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
ROOT=`pwd`
if [ -z $VIRTUAL_ENV ]; then
echo "VIRTUAL_ENV environment variable not found"
echo "Run this script with 'tox -e grafyaml' and with recent versions"
echo "of tox and virtualenv installed."
exit 1
fi
cd $VIRTUAL_ENV
if [ ! -e /usr/zuul-env/bin/zuul-cloner ] &&
[ ! -e $VIRTUAL_ENV/bin/zuul-cloner ];
then
echo "Need to install zuul-cloner"
git clone https://git.openstack.org/openstack-infra/zuul
cd zuul
pip install .
cd ..
fi
if [ -e /usr/zuul-env/bin/zuul-cloner ]; then
ZC=/usr/zuul-env/bin/zuul-cloner
else
ZC=$VIRTUAL_ENV/bin/zuul-cloner
fi
echo "Zuul-cloner is $ZC"
$ZC --cache-dir /opt/git https://git.openstack.org openstack-infra/grafyaml
cd openstack-infra/grafyaml
pip install .
cd ../..
cd $ROOT
grafana-dashboard validate grafana

View File

@ -46,7 +46,7 @@ select = H231
[testenv:grafyaml]
basepython = python2.7
commands = grafana-dashboard validate grafana
commands = {toxinidir}/tools/grafyaml-validate.sh
[testenv:jjb]
basepython = python2.7