test

freedomofpress · Jan 14, 2018 · 9d32171 · 9d32171
1 parent a10d06b
commit 9d32171
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,21 @@
-jobs:
+stages:
+  - tests
+  - integration
+
+lint:
+  stage: tests
   script: |
+    pwd
+    ls
+    apt-get update
+    apt-get install -y make git
+    make -C securedrop testclean || true
+    make -C securedrop images test
+
+integration-test:
+  stage: integration
+  script: |
+    exit 0
     cd devops/openstack
     source bootstrap
     perl -p -e 's/\$(\w+)/$ENV{$1}/e' < clouds.yml.example > clouds.yml

diff --git a/securedrop/Makefile b/securedrop/Makefile
@@ -24,7 +24,7 @@ test:
 		-e COMMIT_SHA=$(TAG) \
 		$(EXTRA_TEST_ARGS) \
 		--name $(IMAGE)-test \
-		-ti $(IMAGE)-test:$(TAG) \
+		$(IMAGE)-test:$(TAG) \
 		./bin/test -v $(TESTFILES)
 
 .PHONY: testclean