From 19a1f98ca48ef0cdc8a60bd5733feb60e8661cd4 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 12 Aug 2019 21:16:21 +0200
Subject: [PATCH] upgrade can be performed only on stretch (because on buster
we don't have tomcat8 for previous version)
---
.gitlab-ci.yml | 14 +++++++-------
debian/template/control | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ad4c0b422..bb1054aa42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -325,7 +325,7 @@ build_debian_package:
- debian/create-debian-pkg.sh
test_upgrade_debian_package:
- image: debian
+ image: debian:stretch
stage: test
only:
- tags
@@ -371,12 +371,12 @@ test_upgrade_debian_package:
- wget http://localhost:8080/minerva/
#test if we can login and get configuration using new version
- - test 200 = $(curl --write-out %{http_code} --silent --output /dev/null -c cookie.txt http://localhost:8080/minerva/api/doLogin)
+ - 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 configuration.json --cookie cookie.txt http://localhost:8080/minerva/api/configuration/)
- test 1 = $(cat configuration.json| grep $version | wc -l)
test_install_debian_package:
- image: debian
+ image: debian:stretch
stage: test
only:
- tags
@@ -402,7 +402,7 @@ 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
+ - apt-get update --allow-insecure-repositories
#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
@@ -414,7 +414,7 @@ test_install_debian_package:
- 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 -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/)
build_rpm:
@@ -447,7 +447,7 @@ rpmlint:
- rpmlint rpm/rpmbuildtemp/RPMS/noarch/minerva-*.rpm
test_deploy_with_db_without_superadmin_rights:
- image: tomcat:7-jre8
+ image: tomcat:8-jre8
stage: test
services:
- postgres:9.6
@@ -471,7 +471,7 @@ test_deploy_with_db_without_superadmin_rights:
- 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 -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/)
diff --git a/debian/template/control b/debian/template/control
index e4d12c6446..14b2be7d67 100644
--- a/debian/template/control
+++ b/debian/template/control
@@ -16,4 +16,4 @@ Section: science
Homepage: http://r3lab.uni.lu/web/minerva-website/
Recommends: postgresql (>=9.3)
Breaks: tomcat7
-Depends: ${misc:Depends}, openjdk-8-jre-headless | openjdk-11-jre-headless, web | dbconfig-no-thanks, tomcat8 |tomcat9
+Depends: ${misc:Depends}, openjdk-8-jre-headless | openjdk-11-jre-headless, dbconfig-pgsql | dbconfig-no-thanks, tomcat8 |tomcat9
--
GitLab