diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..2cbda2918a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,34 @@ +--- +language: python +python: "2.7" + +# Run jobs in VMs - sudo is required by ansible tests. +sudo: required + +# Install ansible +addons: + apt: + packages: + - gcc + - python-apt + - python-virtualenv + - realpath + +# Create a build matrix for the different test jobs. +env: + matrix: + # Run python style checks. + - TOX_ENV=pep8 + # Build documentation. + - TOX_ENV=docs + # Run python2.7 unit tests. + - TOX_ENV=py27 + +install: + # Install tox in a virtualenv to ensure we have an up to date version. + - pip install -U pip + - pip install tox + +script: + # Run the tox environment. + - tox -e ${TOX_ENV} diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index c296b8b591..d6c697ad1f 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -82,6 +82,15 @@ RUN grafana-cli plugins install monasca-datasource \ && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start +RUN mkdir -p /var/lib/grafana/plugins/monasca-grafana \ + && curl -Lo tmp.tgz https://github.com/monasca/monasca-grafana/tarball/master \ + && tar zxvf tmp.tgz -C /var/lib/grafana/plugins/monasca-grafana --strip-components=1 \ + && rm tmp.tgz \ + && npm install -g grunt \ + && cd /var/lib/grafana/plugins/monasca-grafana \ + && npm install \ + && grunt + {% block monasca_grafana_footer %}{% endblock %} {% block footer %}{% endblock %}