Commit 04e4412d authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Simplify gitlab-ci.yml structure and have variables passed correctly

parent a16be71a
...@@ -10,7 +10,7 @@ stages: ...@@ -10,7 +10,7 @@ stages:
- build - build
- test - test
.build: &build build package:
stage: build stage: build
image: registry.salsa.debian.org/salsa-ci-team/images/gbp image: registry.salsa.debian.org/salsa-ci-team/images/gbp
cache: cache:
...@@ -37,11 +37,6 @@ stages: ...@@ -37,11 +37,6 @@ stages:
- du -shc ${WORKING_DIR}/* # Show total file size of artifacts. Must stay are under 100 MB. - du -shc ${WORKING_DIR}/* # Show total file size of artifacts. Must stay are under 100 MB.
- mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} - mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
build package stretch:
<<: *build
variables:
RELEASE: stretch
# Autopkgtest must be disabled, because the test 'upstream' will be skipped and # Autopkgtest must be disabled, because the test 'upstream' will be skipped and
# thus the command returns exit code 2 and is considered failed by Gitlab CI. # thus the command returns exit code 2 and is considered failed by Gitlab CI.
# Removing 'breaks-testbed' stanza from tests/control will result in that the # Removing 'breaks-testbed' stanza from tests/control will result in that the
...@@ -65,7 +60,7 @@ build package stretch: ...@@ -65,7 +60,7 @@ build package stretch:
run lintian stretch: run lintian stretch:
<<: *run_lintian <<: *run_lintian
dependencies: dependencies:
- build package stretch - build package
variables: variables:
RELEASE: stretch RELEASE: stretch
...@@ -109,7 +104,7 @@ run lintian stretch: ...@@ -109,7 +104,7 @@ run lintian stretch:
test upgrade stretch: test upgrade stretch:
stage: test stage: test
dependencies: dependencies:
- build package stretch - build package
image: debian:stretch image: debian:stretch
artifacts: artifacts:
when: always when: always
......
Supports Markdown
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