Commit 4f752d3a authored by Sven Hartge's avatar Sven Hartge

Simplify GitLab CI configuration

- Move registry base URL to variable
- (minor) use docker:dind again,
  salsa-ci-team/pipeline#13 has been
  fixed.
parent afa768f0
Pipeline #31874 passed with stages
in 44 minutes and 14 seconds
......@@ -3,6 +3,7 @@ variables:
DEBEMAIL: "<salsa-pipeline@debian.org>"
DEBIAN_FRONTEND: noninteractive
WORKING_DIR: ${CI_PROJECT_DIR}/debian/output
REGISTRY_BASE_URL: "registry.salsa.debian.org/bacula-team/images"
RELEASE: 'unstable'
stages:
......@@ -11,38 +12,38 @@ stages:
build full:
stage: build
image: registry.salsa.debian.org/bacula-team/images/gbp
image: ${REGISTRY_BASE_URL}/gbp
services:
- docker:rc-dind
- docker:dind
artifacts:
name: "$CI_JOB_NAME:$CI_COMMIT_REF_NAME"
paths:
- ${WORKING_DIR}/
script:
- gbp pull --ignore-branch --pristine-tar --track-missing
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh registry.salsa.debian.org/bacula-team/images/dockerbuilder:${RELEASE} --build=full"
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh ${REGISTRY_BASE_URL}/dockerbuilder:${RELEASE} --build=full"
build arch:
stage: build
image: registry.salsa.debian.org/bacula-team/images/gbp
image: ${REGISTRY_BASE_URL}/gbp
services:
- docker:rc-dind
- docker:dind
script:
- gbp pull --ignore-branch --pristine-tar --track-missing
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh registry.salsa.debian.org/bacula-team/images/dockerbuilder:${RELEASE} --build=any"
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh ${REGISTRY_BASE_URL}/dockerbuilder:${RELEASE} --build=any"
build indep:
stage: build
image: registry.salsa.debian.org/bacula-team/images/gbp
image: ${REGISTRY_BASE_URL}/gbp
services:
- docker:rc-dind
- docker:dind
script:
- gbp pull --ignore-branch --pristine-tar --track-missing
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh registry.salsa.debian.org/bacula-team/images/dockerbuilder:${RELEASE} --build=all"
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder="docker-build.sh ${REGISTRY_BASE_URL}/dockerbuilder:${RELEASE} --build=all"
lintian:
stage: test
image: registry.salsa.debian.org/bacula-team/images/lintian
image: ${REGISTRY_BASE_URL}/lintian
variables:
GIT_STRATEGY: none
script:
......@@ -50,7 +51,7 @@ lintian:
build log scanner:
stage: test
image: registry.salsa.debian.org/bacula-team/images/blhc
image: ${REGISTRY_BASE_URL}/blhc
variables:
GIT_STRATEGY: none
script:
......@@ -58,25 +59,25 @@ build log scanner:
autopkgtest sqlite3:
stage: test
image: registry.salsa.debian.org/bacula-team/images/autopkgtest
image: ${REGISTRY_BASE_URL}/autopkgtest
script:
- eatmydata autopkgtest --override-control=debian/tests/control-sqlite3 -U ${WORKING_DIR}/*.changes -- null || [ $? -eq 8 ]
autopkgtest mysql:
stage: test
image: registry.salsa.debian.org/bacula-team/images/autopkgtest
image: ${REGISTRY_BASE_URL}/autopkgtest
script:
- eatmydata autopkgtest --override-control=debian/tests/control-mysql -U ${WORKING_DIR}/*.changes -- null || [ $? -eq 8 ]
autopkgtest pgsql:
stage: test
image: registry.salsa.debian.org/bacula-team/images/autopkgtest
image: ${REGISTRY_BASE_URL}/autopkgtest
script:
- eatmydata autopkgtest --override-control=debian/tests/control-pgsql -U ${WORKING_DIR}/*.changes -- null || [ $? -eq 8 ]
reprotest:
stage: test
image: registry.salsa.debian.org/bacula-team/images/reprotest
image: ${REGISTRY_BASE_URL}/reprotest
artifacts:
name: "$CI_JOB_NAME:$CI_COMMIT_REF_NAME"
paths:
......@@ -90,7 +91,7 @@ reprotest:
piuparts sqlite3:
stage: test
image: registry.salsa.debian.org/bacula-team/images/piuparts
image: ${REGISTRY_BASE_URL}/piuparts
variables:
GIT_STRATEGY: none
services:
......@@ -107,7 +108,7 @@ piuparts sqlite3:
piuparts mysql:
stage: test
image: registry.salsa.debian.org/bacula-team/images/piuparts
image: ${REGISTRY_BASE_URL}/piuparts
variables:
GIT_STRATEGY: none
services:
......@@ -124,7 +125,7 @@ piuparts mysql:
piuparts pgsql:
stage: test
image: registry.salsa.debian.org/bacula-team/images/piuparts
image: ${REGISTRY_BASE_URL}/piuparts
variables:
GIT_STRATEGY: none
services:
......
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