Merge branch 'gitlab-install-test' into 'master'

Gitlab install test

See merge request !583

.gitlab-ci.yml

@@ -232,15 +232,16 @@ test_upgrade_debian_package:
      - 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-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
      - apt-add-repository "deb http://repo-r3lab.uni.lu/debian/ stable main"
-     - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xcb185f4e31872412
+     - apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xcb185f4e31872412
      - 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 gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
+     - chmod 0755 /usr/sbin/policy-rc.d
      - apt-get install -y --allow-unauthenticated minerva
 
 #local repository with new version
@@ -286,6 +287,7 @@ test_install_debian_package:
 #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 gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
+     - chmod 0755 /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

CHANGELOG

-minerva (12.2.0~alpha.0) stable; urgency=medium
+minerva (12.2.0~alpha.1) unstable; urgency=medium
+  * Bug fix: problems with SBML-CellDesigner translation fixed
+  * Bug fix: gitlab CI tests fixed
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 17 Jan 2019 15:00:00 +0200
+
+minerva (12.2.0~alpha.0) unstable; urgency=medium
   * Feature: url GET parameters support all kind of search and selected overlays
     highlight
   * Feature: user can create custom logging configuration in file 

debian/scripts/common.sh

@@ -69,6 +69,7 @@ exec_sql_file(){
 	PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -p $DB_PORT -U $DB_USERNAME $DB_DATABASE_NAME -f $1 >>$LOG_FILE 2>>$LOG_FILE
 }
 create_db(){
+	log "Create db: (remote=$IS_REMOTE_DB)"
 	if [ $IS_REMOTE_DB  = false ]
 	then
 		su - postgres -c "createuser -d -r -s -p $DB_PORT $DB_USERNAME"  >>$LOG_FILE 2>>$LOG_FILE
@@ -88,12 +89,14 @@ create_db(){
 	fi
 }
 stop_postgres() {
+	log "Stop postgres: (remote=$IS_REMOTE_DB)"
 	if [ $IS_REMOTE_DB  = false ]
 	then
 		invoke-rc.d postgresql stop || true
 	fi
 }
 start_postgres() {
+	log "Start postgres: (remote=$IS_REMOTE_DB)"
 	if [ $IS_REMOTE_DB  = false ]
 	then
 		invoke-rc.d postgresql restart