From 6ae0eef6b58135848dce8218b84dd6da1c591d44 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 27 Jul 2018 14:34:00 +0200
Subject: [PATCH] debian filename fixed

---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ef6bc99f6..80a13137df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,7 @@ test_debian_package:
   services:
      - name: piotrgawron/debian-repo
        alias: debian-repo
+# we need to run it in privileged mode due to: https://stackoverflow.com/questions/29683231/tomcat7-fail-to-start-inside-ubuntu-docker-container
   tags:
      - privileged
   dependencies:
@@ -64,22 +65,25 @@ test_debian_package:
   script:
      - apt-get update
      - apt-get install -y ssh software-properties-common dirmngr wget curl
-     - ls debian
      - debian_file=$(ls debian/*.deb)
-     - echo "PUT debian/$debian_file /docker/incoming" | sftp -o StrictHostKeyChecking=no user@debian-repo
+     - echo "PUT $debian_file /docker/incoming" | sftp -o StrictHostKeyChecking=no user@debian-repo
      - ssh root@debian-repo /usr/local/sbin/reprepro-import
      - apt-add-repository "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
      - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
      - apt-add-repository "deb http://debian-repo/ unstable main"
      - apt-get update
+# auto accept oracle license
      - echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
+#hacky way of installing minerva on docker - by default rc-invoke is preventing services changes on docker
      - mv /usr/sbin/policy-rc.d /usr/sbin/policy-rc.d.backup
      - mv Docker/policy-rc.d /usr/sbin/policy-rc.d
      - apt-get install -y --allow-unauthenticated minerva
      - mv /usr/sbin/policy-rc.d.backup /usr/sbin/policy-rc.d 
      - service tomcat8 start
+#we need to wait a bit for tomcat start
      - sleep 15
      - wget http://localhost:8080/minerva/
+#test if we can login and list projects
      - test 200 = $(curl --write-out %{http_code} --silent --output /dev/null -c cookie.txt http://localhost:8080/minerva/api/doLogin)
      - test 200 = $(curl --write-out %{http_code} --silent --output /dev/null --cookie cookie.txt http://localhost:8080/minerva/api/projects/)
 
-- 
GitLab