From 3328ef7ca673664f7c99342476df82eb6cb5742e Mon Sep 17 00:00:00 2001
From: armin <armin.felder@osalliance.com>
Date: Fri, 18 May 2018 14:45:40 +0200
Subject: [PATCH] test
---
.gitlab-ci.yml | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64b31ca..f9e521d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: augusteo/centos-rsync-openssh
+image: docker:latest
variables:
GIT_SUBMODULE_STRATEGY: recursive
@@ -6,16 +6,24 @@ variables:
stages:
- test
-API_TEST_RC0.64.0:
- image: afelder/qt-android-docker
- services:
- - mongo:3.0
- alias:db
- - rocketchat/rocket.chat:0.64.0
- stage: test
- script:
- - mkdir build
- - cd build
- - /opt/Qt/5.9.3/gcc_64/bin/qmake -spec linux-g++ CONFIG+=test DEFINES+=MAJOR=0 DEFINES+=MINOR=64 DEFINES+=PATCH=0 ../engine.pro
- - make -j9
- - ./unittests
\ No newline at end of file
+#API_TEST_RC0.64.0:
+# image: afelder/qt-android-docker
+# services:
+# - mongo:3.0
+# alias:db
+# - rocketchat/rocket.chat:0.64.0
+# stage: test
+# script:
+# - mkdir build
+# - cd build
+# - /opt/Qt/5.9.3/gcc_64/bin/qmake -spec linux-g++ CONFIG+=test DEFINES+=MAJOR=0 DEFINES+=MINOR=64 DEFINES+=PATCH=0 ../engine.pro
+# - make -j9
+# - ./unittests
+
+job1:
+ stage: test
+ services:
+ - docker:dind
+ script:
+ - docker run -name db -d mongo:3.0 --smallfiles
+ - docker run --name rc0640 --link db -d rocket.chat:0.64.0
--
GitLab