diff options
| -rw-r--r-- | .gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | Makefile.example | 2 | ||||
| -rw-r--r-- | example_project/local_settings.py.gitlab-ci | 8 |
3 files changed, 19 insertions, 17 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 diff --git a/Makefile.example b/Makefile.example index 7773481e6..97f444b82 100644 --- a/Makefile.example +++ b/Makefile.example @@ -140,7 +140,7 @@ test_gitlab: clean collectstatic makemessages ## specific test for gitlab cd $(project); $(PYTHON) manage.py test --exclude-tag no_ci --exclude-tag gis --exclude-tag ui --exclude-tag libreoffice $(apps) soft_test_gitlab: build_gitlab ## run test for gitlab - do not erase previous database - cd $(project); $(PYTHON) manage.py -k test $(apps) + cd $(project); $(PYTHON) manage.py test -k --exclude-tag no_ci --exclude-tag gis --exclude-tag ui --exclude-tag libreoffice $(apps) run_libreoffice: ## run libreoffice daemon for testing purpose /usr/bin/libreoffice --headless --accept="socket,host=127.0.0.1,port=8101;urp;" --nodefault --nofirststartwizard --nolockcheck --nologo --norestore --invisible --pidfile=/var/run/libreoffice.pid diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci index bc842f004..3831a56fa 100644 --- a/example_project/local_settings.py.gitlab-ci +++ b/example_project/local_settings.py.gitlab-ci @@ -1,10 +1,10 @@ DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': 'gis', - 'USER': 'gis', - 'PASSWORD': 'gis', - 'HOST': 'postgis-postgis', + 'NAME': 'ishtar_test', + 'USER': 'ishtar_test', + 'PASSWORD': 'ishtar_test', + 'HOST': '127.0.0.1', 'PORT': '5432', } } |