Commit 0d0d46fb authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '879-add-support-for-debian-buster' into 'master'

fix gitlab jobs

Closes #879

See merge request minerva/core!872
parents e36db602 19a1f98c
Pipeline #12699 failed with stage
in 9 minutes and 25 seconds
......@@ -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/)
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment