summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-06-26 14:05:45 +0200
committerVarac <varac@leap.se>2017-06-26 14:05:45 +0200
commitbfb455133326af3bb5fda08c4448f6f97a8a2159 (patch)
treea2fdabbdc781e61d564cf0c5254d3f743416a376
parent0a048ce05833990eadcafed163939e847c421352 (diff)
[pkg] Use git-buildpackage image for packaging
-rw-r--r--.gitlab-ci.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d935586..b59afb87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
- package
- benchmark
-image: 0xacab.org:4567/leap/soledad:latest
variables:
DOCKER_DRIVER: overlay
@@ -44,12 +43,14 @@ before_script:
code-check:
stage: code-check
+ image: 0xacab.org:4567/leap/soledad:latest
script:
- cd testing
- tox -e code-check
tests:
stage: tests
+ image: 0xacab.org:4567/leap/soledad:latest
services:
- couchdb
script:
@@ -58,6 +59,7 @@ tests:
benchmark:
stage: benchmark
+ image: 0xacab.org:4567/leap/soledad:latest
tags:
- benchmark
services:
@@ -79,8 +81,8 @@ benchmark:
--couch-url http://couchdb:5984 -m 'not synchronous' | /usr/bin/ts -s
build_docker_image:
- image: 0xacab.org:4567/leap/soledad:latest
stage: build
+ image: 0xacab.org:4567/leap/soledad:latest
services:
- docker:dind
tags:
@@ -110,7 +112,7 @@ package:amd64_jessie:
LINTIAN_OPTS: "-X filename-length"
<<: *job_definition
-#package:amd64_stretch:
+# package:amd64_stretch:
# variables:
# ARCH: "amd64"
# DIST: "stretch"