summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2017-05-25 08:10:19 +0530
committerGitHub <noreply@github.com>2017-05-25 08:10:19 +0530
commita21c824de615c2e82134b91f042e7b6314189e5c (patch)
treefc0ce97b17d731155bdeb2b1b483553d5a4631b2
parente0743a5e4d81b425cd289c685ffff5b3124d4252 (diff)
parente494a047a02e043e5143db13a3531a366f53ea0a (diff)
downloadgluster-a21c824de615c2e82134b91f042e7b6314189e5c.tar.gz
gluster-a21c824de615c2e82134b91f042e7b6314189e5c.tar.bz2
gluster-a21c824de615c2e82134b91f042e7b6314189e5c.tar.xz
gluster-a21c824de615c2e82134b91f042e7b6314189e5c.zip
Merge pull request #44 from MohamedAshiqrh/cifix
Travis CI update and disabling dockerfile_lint
-rw-r--r--.travis.yml26
-rwxr-xr-xtests/Dockerfiletest/run_mask.sh (renamed from tests/Dockerfiletest/run.sh)0
-rw-r--r--tests/README.md6
3 files changed, 24 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 0badc89..88f5090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,26 @@ addons:
packages:
- shellcheck
+services:
+ - docker
+
before_install:
-- sudo apt-get install -y -qq npm
-- sudo add-apt-repository -y ppa:chris-lea/node.js
-- sudo apt-get -y update
-- sudo apt-get install -y nodejs
-- sudo npm config set registry http://registry.npmjs.org/
-- sudo npm install -g npm
-- sudo npm install -g dockerfile_lint
+- sudo apt-get update
+- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine
+- docker build -t gluster/client ./gluster-client/
+- docker run -it --name client gluster/client rpm -qa | grep gluster
+- docker build -t gluster/centos ./CentOS/
+- docker run -d --name gcentos --privileged gluster/centos
+- sleep 10
+- docker exec -it gcentos systemctl is-active glusterd
+- docker build -t gluster/fedora ./Fedora/
+- docker run -d --name gfedora --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro gluster/fedora
+- sleep 10
+- docker exec -it gfedora systemctl is-active glusterd
+- docker build -t gluster/swift ./gluster-object/CentOS/docker-gluster-swift/
+- docker run -d --name swift --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro -e GLUSTER_VOLUMES=vol gluster/swift
+- sleep 10
+- docker exec -it swift systemctl is-active swift-object
script:
- make test
diff --git a/tests/Dockerfiletest/run.sh b/tests/Dockerfiletest/run_mask.sh
index b82b810..b82b810 100755
--- a/tests/Dockerfiletest/run.sh
+++ b/tests/Dockerfiletest/run_mask.sh
diff --git a/tests/README.md b/tests/README.md
index 501af35..2d825d4 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -22,10 +22,14 @@ Install with
* `dnf install ShellCheck`, or
* `apt-get install shellcheck`
+## Travis CI
+* dockerfile_lint has dependency problem, hence disabling it.
+* Builds the docker image and does a basic test.
+* Tests the shell script.
+
## TODOs
* Write more tests
-* More elaborate basic tests - docker build, docker run of basic commands.
* Write full functional tests to be run in vms.
(like the atomic vagrant environment)