summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml26
1 files changed, 14 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71cbcd6f5..82ae0b519 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,14 +3,20 @@ before_script:
- apt-get install -q -y locales locales-all
- echo "fr_FR.UTF-8 UTF-8" >> /etc/locale.gen
- dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=fr_FR.UTF-8
- - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz python3-argon2 file gettext
+ - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz python3-argon2 file gettext postgresql postgresql-13-postgis-3
- pip3 install -r requirements.txt
- cp Makefile.example Makefile
+ - su -c "createuser -w -d ishtar_test" postgres
+ - su -c "createdb -E UTF8 -O ishtar_test ishtar_test" postgres
+ - su -c "createdb -E UTF8 -O ishtar_test test_ishtar_test" postgres
+ - su -c "psql -c \"ALTER ROLE ishtar_test WITH PASSWORD 'ishtar_test';\"" postgres
+ - su -c "psql -d ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
+ - su -c "psql -d test_ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
-variables:
- POSTGRES_DB: gis
- POSTGRES_USER: gis
- POSTGRES_PASSWORD: "gis"
+after_script:
+ - su -c "dropdb ishtar_test" postgres
+ - su -c "dropdb test_ishtar_test" postgres
+ - su -c "dropuser ishtar_test" postgres
build-v4:
stage: "build"
@@ -19,10 +25,8 @@ build-v4:
- cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
- mkdir -p /var/log/django/
- make build_gitlab
- services:
- - postgis/postgis:13-3.3
tags:
- - bullseye
+ - bullseye-shell
only:
- main
- develop
@@ -33,11 +37,9 @@ test-v4:
- sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py
- cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
- mkdir -p /var/log/django/
- - make test_gitlab
- services:
- - postgis/postgis:13-3.3
+ - make soft_test_gitlab
tags:
- - bullseye
+ - bullseye-shell
only:
- main
- develop