Support running in Jenkins

Author: Andrew Hampe

.dockerignore

@@ -7,5 +7,10 @@ coverage
 doc/
 .ruby-version
 .idea/
+*.iml
 .git/
 .gitignore
+
+# Jenkins/Docker
+results/
+Dockerfile.test

.gitignore

@@ -7,3 +7,7 @@ coverage
 doc/
 .ruby-version
 .idea/
+*.iml
+
+# Jenkins/Docker
+results/

Dockerfile.test

@@ -20,7 +20,7 @@ WORKDIR /fauna/faunadb-ruby
 RUN bundle install
 
 # Define the default variables for the tests
-ENV FAUNA_ROOT_KEY=secret FAUNA_DOMAIN=db.fauna.com FAUNA_SCHEME=https FAUNA_PORT=443
+ENV FAUNA_ROOT_KEY=secret FAUNA_DOMAIN=db.fauna.com FAUNA_SCHEME=https FAUNA_PORT=443 FAUNA_TIMEOUT=30s
 
 # Run the tests (after target database is up)
-ENTRYPOINT dockerize -wait "$FAUNA_SCHEME://$FAUNA_DOMAIN:$FAUNA_PORT/ping" -timeout 30s bundle exec rake spec
+CMD ["make", "docker-wait", "test"]

Makefile

@@ -17,6 +17,19 @@ ifdef FAUNA_PORT
 DOCKER_RUN_FLAGS += -e FAUNA_PORT=$(FAUNA_PORT)
 endif
 
+ifdef FAUNA_TIMEOUT
+DOCKER_RUN_FLAGS += -e FAUNA_TIMEOUT=$(FAUNA_TIMEOUT)
+endif
+
+test:
+	bundle exec rake spec
+
+jenkins-test:
+	bundle exec rspec --format progress --format RspecJunitFormatter --out results/report.xml
+
+docker-wait:
+	dockerize -wait $(FAUNA_SCHEME)://$(FAUNA_DOMAIN):$(FAUNA_PORT)/ping -timeout $(FAUNA_TIMEOUT)
+
 docker-test:
 	docker build -f Dockerfile.test -t faunadb-ruby-test:latest --build-arg RUNTIME_IMAGE=$(RUNTIME_IMAGE) .
 	docker run $(DOCKER_RUN_FLAGS) faunadb-ruby-test:latest

fauna.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rubocop', '~> 0.38.0'
   s.add_development_dependency 'codecov', '~> 0.1.5'
+  s.add_development_dependency 'rspec_junit_formatter', '~> 0.3.0'
 end