ci: use the "extends" key instead of the ugly anchor syntax

This commit is contained in:
louiz’
2019-09-15 21:41:39 +02:00
parent 9ed6442fc1
commit c392d7127f
+18 -18
View File
@@ -23,7 +23,7 @@ variables:
## Build jobs ## Build jobs
# #
.template:basic_build: &basic_build .basic_build:
stage: build stage: build
tags: tags:
- docker - docker
@@ -38,25 +38,25 @@ variables:
paths: paths:
- build/ - build/
.template:fedora_build: &fedora_build .fedora_build:
<<: *basic_build extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-fedora:latest image: docker.louiz.org/louiz/biboumi/test-fedora:latest
build:fedora: build:fedora:
<<: *fedora_build extends: .fedora_build
build:debian: build:debian:
<<: *basic_build extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-debian:latest image: docker.louiz.org/louiz/biboumi/test-debian:latest
build:alpine: build:alpine:
extends: .basic_build
variables: variables:
SYSTEMD: "-DWITHOUT_SYSTEMD=1" SYSTEMD: "-DWITHOUT_SYSTEMD=1"
<<: *basic_build
image: docker.louiz.org/louiz/biboumi/test-alpine:latest image: docker.louiz.org/louiz/biboumi/test-alpine:latest
build:archlinux: build:archlinux:
<<: *basic_build extends: .basic_build
only: only:
- branches@louiz/biboumi - branches@louiz/biboumi
- triggers - triggers
@@ -66,46 +66,46 @@ build:archlinux:
paths: [] paths: []
build:no_botan: build:no_botan:
extends: .fedora_build
variables: variables:
BOTAN: "-DWITHOUT_BOTAN=1" BOTAN: "-DWITHOUT_BOTAN=1"
<<: *fedora_build
build:no_udns: build:no_udns:
extends: .fedora_build
variables: variables:
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
<<: *fedora_build
build:no_libidn: build:no_libidn:
extends: .fedora_build
variables: variables:
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
<<: *fedora_build
build:no_sqlite3: build:no_sqlite3:
extends: .fedora_build
variables: variables:
SQLITE3: "-DWITHOUT_SQLITE3=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
TEST_POSTGRES_URI: "postgres@postgres/postgres" TEST_POSTGRES_URI: "postgres@postgres/postgres"
services: services:
- postgres:latest - postgres:latest
<<: *fedora_build
build:no_db: build:no_db:
extends: .fedora_build
variables: variables:
SQLITE3: "-DWITHOUT_SQLITE3=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1" POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build
build:no_db_botan: build:no_db_botan:
extends: .fedora_build
variables: variables:
SQLITE3: "-DWITHOUT_SQLITE3=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1" POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
BOTAN: "-DWITHOUT_BOTAN=1" BOTAN: "-DWITHOUT_BOTAN=1"
<<: *fedora_build
# #
## Test jobs ## Test jobs
# #
.template:basic_test: &basic_test .basic_test:
stage: test stage: test
tags: tags:
- docker - docker
@@ -115,15 +115,15 @@ build:no_db_botan:
- make e2e -j$(nproc || echo 1) - make e2e -j$(nproc || echo 1)
test:debian: test:debian:
extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-debian:latest image: docker.louiz.org/louiz/biboumi/test-debian:latest
<<: *basic_test
dependencies: dependencies:
- build:debian - build:debian
needs: ["build:debian"] needs: ["build:debian"]
test:fedora: test:fedora:
extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:latest image: docker.louiz.org/louiz/biboumi/test-fedora:latest
<<: *basic_test
script: script:
- cd build/ - cd build/
- make coverage_check -j$(nproc || echo 1) - make coverage_check -j$(nproc || echo 1)
@@ -143,15 +143,15 @@ test:fedora:
name: $CI_PROJECT_NAME-test-$CI_JOB_ID name: $CI_PROJECT_NAME-test-$CI_JOB_ID
test:no_udns: test:no_udns:
extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:latest image: docker.louiz.org/louiz/biboumi/test-fedora:latest
<<: *basic_test
dependencies: dependencies:
- build:no_udns - build:no_udns
needs: ["build:no_udns"] needs: ["build:no_udns"]
test:alpine: test:alpine:
extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-alpine:latest image: docker.louiz.org/louiz/biboumi/test-alpine:latest
<<: *basic_test
dependencies: dependencies:
- build:alpine - build:alpine
needs: ["build:alpine"] needs: ["build:alpine"]