summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJonathan Holloway <jholloway@redhat.com>2017-09-26 16:53:05 -0500
committerJonathan Holloway <jholloway@redhat.com>2017-09-26 22:16:20 +0000
commit0c12155457af7ee0ddafd5311cac9a238fc5d00f (patch)
tree88c99d53aabc22ccef631608f867f04e4790a5f7 /docker
parentb02e147e35ebec6da669fb125d51062b82f46af4 (diff)
docker: fix gdeploy install
* Dockerfile: fix gdeploy pkgname and add code coverage tools * README: update command examples Change-Id: I73617fbbde6aff34fec730601dcc6baec2b921fa Signed-off-by: Jonathan Holloway <jholloway@redhat.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile6
-rw-r--r--docker/README14
2 files changed, 12 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 675de21..400fcde 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER loadtheaccumulator@gmail.com
# install gdeploy first due to pip/rpm PyYAML conflict
RUN dnf install -y wget
RUN wget -q https://copr.fedorainfracloud.org/coprs/sac/gdeploy/repo/fedora-26/sac-gdeploy-fedora-26.repo -O /etc/yum.repos.d/gdeploy.repo
-RUN dnf install -y gdeploy-*
+RUN dnf install -y gdeploy*
# install glusto
RUN dnf install -y git
@@ -23,3 +23,7 @@ RUN cd /glusto-tests/glustolibs-misc; python setup.py install
# install dev extras
RUN dnf install -y pylint
RUN dnf install -y python-pep8
+
+# install code coverage extras
+RUN dnf install -y lcov
+RUN pip install gcovr
diff --git a/docker/README b/docker/README
index d9a9851..3844e6d 100644
--- a/docker/README
+++ b/docker/README
@@ -1,4 +1,4 @@
-This Dockerfile adds the Gluster glustolibs libraries on top of the Glusto container to provide the complete environment required to run Gluster QE tests under Glusto.
+This Dockerfile adds Glusto and the Gluster glustolibs libraries on top of the Fedora container to provide the complete environment required to run Gluster QE tests under Glusto.
This container is currently based on Fedora and also installs gdeploy as required by NFS Ganesha tests.
This is currently a minimal implementation. More to come.
@@ -9,18 +9,18 @@ To use the pre-gen'd image...
1. Pull the docker image down to your local system.
- # docker pull loadtheaccumulator/glusto-tests
+ # docker pull gluster/glusto-tests
2. Run the image with docker.
- # docker run -it --rm --privileged=true -v <local_dir_path>:<container_dir_path> docker.io/loadtheaccumulator/glusto-tests /bin/bash
+ # docker run -it --rm --privileged=true -v <local_dir_path>:<container_dir_path> docker.io/gluster/glusto-tests /bin/bash
... or for example to run a test directly...
# docker run -it --rm --privileged=true \
- -v <local_dir_path>:<container_dir_path> \
- docker.io/loadtheaccumulator/glusto-tests \
- /usr/bin/glusto -c <container_path_to_config> \
- --pytest="-vv <container_dir_path>/test_your_test_file.py"
+ -v $WORKSPACE/:/workspace \
+ docker.io/gluster/glusto-tests \
+ /usr/bin/glusto -c /workspace/myservers.yml \
+ --pytest="-vv /workspace/testdir/test_your_test_file.py"
More robust docs and examples coming soon.