diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:38:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:38:45 +0200 |
| commit | 46c97a2e19d5048c370342dc388bd457a861406a (patch) | |
| tree | 401f7dbe538e73b187ca7f3137eea5fd68cf0e7b | |
| parent | 6ea91383f48c568901e95ae682a429be8d7297d6 (diff) | |
| download | Ishtar-46c97a2e19d5048c370342dc388bd457a861406a.tar.bz2 Ishtar-46c97a2e19d5048c370342dc388bd457a861406a.zip | |
CI: add specific jobs for v2
| -rw-r--r-- | .gitlab-ci.yml | 57 |
1 files changed, 54 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1510bd619..6de24cc8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,25 +10,54 @@ variables: POSTGRES_USER: gis POSTGRES_PASSWORD: "gis" -services: - - iggdrasil/postgis-1.5 - build: stage: "build" script: "make build_gitlab" + services: + - iggdrasil/postgis-1.5 + tags: + - wheezy only: - master - v0.9 - wheezy +build-v2: + stage: "build" + script: "make build_gitlab" + services: + - mdillon/postgis + tags: + - jessie + only: + - develop + - v2.0 + - jessie + test: stage: "test" script: "make test_gitlab" + services: + - iggdrasil/postgis-1.5 + tags: + - wheezy only: - master - v0.9 - wheezy +test-v2: + stage: "test" + script: "make test_gitlab" + services: + - mdillon/postgis + tags: + - jessie + only: + - develop + - v2.0 + - jessie + debian: stage: "test" script: @@ -40,5 +69,27 @@ debian: - apt-get install -q -y --force-yes python-django-ishtar locales-all - INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance - dpkg -i python-django-ishtar_*.deb + services: + - iggdrasil/postgis-1.5 + tags: + - wheezy only: - wheezy + +debian-v2: + stage: "test" + script: + - apt-get install -q -y devscripts build-essential lintian wget + - make deb + - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/dists/wheezy/iggdrasil.list + - wget -O - http://deb.iggdrasil.net/contact@iggdrasil.net.gpg.key | apt-key add - + - apt-get update + - apt-get install -q -y --force-yes python-django-ishtar locales-all + - INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance + - dpkg -i python-django-ishtar_*.deb + services: + - mdillon/postgis + tags: + - jessie + only: + - jessie |