Merge branch 'releases/release-0.10.0' into master

e-gov · Nov 28, 2017 · 61af47c · 61af47c
2 parents 953236b + be489c2
commit 61af47c
Show file tree

Hide file tree

Showing 9 changed files with 810 additions and 861 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,22 +1,12 @@
 image: riha-test-env
 
 variables:
-    DEPLOYMENT_DIR: "/opt/tomcat/webapps"
     ARTIFACT_NAME: "$CI_PROJECT_NAME.war"
 
 stages:
-    - test
     - build
     - deploy
 
-# Tests are failing. Commented for now
-# test:
-#     stage: test
-#     script:
-#         - mvn clean test
-#     tags:
-#         - riha
-
 build:
     stage: build
     script:
@@ -36,8 +26,7 @@ deploy_development:
         - echo "$SSH_HOST_KEY" > $HOME/.ssh/known_hosts
         - scp -i id_rsa target/*.war deployer@$SSH_HOST:$DEPLOYMENT_DIR/$ARTIFACT_NAME
     environment:
-        name: development
-        url: http://$SSH_HOST:$PORT/
+        name: demo
     when: manual
     tags:
         - riha