Resolve "fix install tests"

Closes #1960 (closed)

.gitlab-ci.yml

@@ -480,7 +480,7 @@ test_install_debian_package:
      - echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list
      - echo "deb-src http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list
      - apt-get update
-     - DEBIAN_FRONTEND=noninteractive apt-get install -y ssh software-properties-common dirmngr wget curl postgresql
+     - DEBIAN_FRONTEND=noninteractive apt-get install -y ssh software-properties-common dirmngr wget curl postgresql screen
      - service postgresql start
      - debian_file=$(ls debian/*.deb)
      - echo debconf minerva/internal/skip-preseed boolean true | debconf-set-selections
@@ -489,46 +489,15 @@ test_install_debian_package:
      - echo debconf minerva/remote/host select localhost | debconf-set-selections
      - echo debconf minerva/db/dbname select minerva_db | debconf-set-selections
      - echo debconf minerva/db/app-user select minerva_user@localhost | debconf-set-selections
-     - apt-get update
      - DEBIAN_FRONTEND=noninteractive apt-get install -y ./$debian_file
-     - java -jar /usr/share/minerva/minerva.jar &
-#we need to wait a bit for tomcat start
+     - screen -d -m java -jar /usr/share/minerva/minerva.jar
+#we need to wait a bit - app needs to start
      - sleep 15
      - wget http://localhost:8080/minerva/
 #test if we can login and list projects
      - test 200 = $(curl -X POST -d "login=admin&password=admin" --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/)
 
-test_deploy_with_db_without_superadmin_rights:
-  image: maven:3.8.6-jdk-8
-  stage: test
-  services:
-    - postgres:9.6
-  dependencies:
-    - build_jar
-  tags:
-    - privileged
-  only:
-    - tags
-  script:
-    - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -y postgresql-client
-    - mkdir -p /etc/minerva
-    - echo "database.uri=jdbc:postgresql://postgres:5432/test" > /etc/minerva/db.properties
-    - echo "database.username=test" >> /etc/minerva/db.properties
-    - echo "database.password=test" >> /etc/minerva/db.properties
-    - echo "CREATE DATABASE test;CREATE USER test WITH ENCRYPTED PASSWORD 'test';GRANT ALL PRIVILEGES ON DATABASE test TO test;" >tmp.sql
-    - PGPASSWORD=$POSTGRES_PASSWORD psql -h postgres -U $POSTGRES_USER $POSTGRES_DB < tmp.sql
-    - mkdir -p /usr/share/minerva/data/
-    - mv minerva.jar /usr/share/minerva/
-    - java -jar /usr/share/minerva/minerva.jar
-    - sleep 15
-    - curl http://localhost:8080/minerva/
-#test if we can login and list projects
-    - test 200 = $(curl -X POST -d "login=admin&password=admin" --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/)
-
-
 .test_database_template: &test_database_definition
   image: maven:3.8.6-jdk-8
   stage: test