Commit a1dbec3b authored by Michał Kępień's avatar Michał Kępień

Reorder job definitions

Group jobs by build type and operating system to make the layout of
.gitlab-ci.yml more consistent and improve locality of YAML references.
parent 1fe432c6
......@@ -185,6 +185,18 @@ gcc:centos6:amd64:
<<: *centos_centos6_amd64_image
<<: *build_job
system:gcc:centos6:amd64:
<<: *centos_centos6_amd64_image
<<: *system_test_job
dependencies:
- gcc:centos6:amd64
unit:gcc:centos6:amd64:
<<: *centos_centos6_amd64_image
<<: *unit_test_job
dependencies:
- gcc:centos6:amd64
gcc:centos7:amd64:
variables:
CC: gcc
......@@ -193,13 +205,17 @@ gcc:centos7:amd64:
<<: *centos_centos7_amd64_image
<<: *build_job
clang:stretch:amd64:
variables:
CC: clang
CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
EXTRA_CONFIGURE: "--with-python=python3"
<<: *debian_stretch_amd64_image
<<: *build_job
system:gcc:centos7:amd64:
<<: *centos_centos7_amd64_image
<<: *system_test_job
dependencies:
- gcc:centos7:amd64
unit:gcc:centos7:amd64:
<<: *centos_centos7_amd64_image
<<: *unit_test_job
dependencies:
- gcc:centos7:amd64
gcc:jessie:amd64:
variables:
......@@ -209,6 +225,18 @@ gcc:jessie:amd64:
<<: *debian_jessie_amd64_image
<<: *build_job
system:gcc:jessie:amd64:
<<: *debian_jessie_amd64_image
<<: *system_test_job
dependencies:
- gcc:jessie:amd64
unit:gcc:jessie:amd64:
<<: *debian_jessie_amd64_image
<<: *unit_test_job
dependencies:
- gcc:jessie:amd64
gcc:stretch:amd64:
variables:
CC: gcc
......@@ -216,6 +244,18 @@ gcc:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *build_job
system:gcc:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *system_test_job
dependencies:
- gcc:stretch:amd64
unit:gcc:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *unit_test_job
dependencies:
- gcc:stretch:amd64
gcc:sid:amd64:
variables:
CC: gcc
......@@ -228,54 +268,27 @@ gcc:sid:amd64:
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
asan:sid:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g -fsanitize=address,undefined -DISC_MEM_USE_INTERNAL_MALLOC=0"
LDFLAGS: "-fsanitize=address,undefined"
EXTRA_CONFIGURE: "--with-libidn2"
install:gcc:sid:amd64:
<<: *debian_sid_amd64_image
<<: *build_job
clang:stretch:i386:
variables:
CC: clang
CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
EXTRA_CONFIGURE: "--with-python=python2"
<<: *debian_stretch_i386_image
<<: *build_job
gcc:sid:i386:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--with-libidn2 --without-python"
<<: *debian_sid_i386_image
<<: *build_job
unit:gcc:centos6:amd64:
<<: *centos_centos6_amd64_image
<<: *unit_test_job
dependencies:
- gcc:centos6:amd64
unit:gcc:centos7:amd64:
<<: *centos_centos7_amd64_image
<<: *unit_test_job
dependencies:
- gcc:centos7:amd64
unit:gcc:jessie:amd64:
<<: *debian_jessie_amd64_image
<<: *unit_test_job
stage: test
script:
- make install
dependencies:
- gcc:jessie:amd64
- gcc:sid:amd64
only:
- merge_requests
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
unit:gcc:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *unit_test_job
system:gcc:sid:amd64:
<<: *debian_sid_amd64_image
<<: *system_test_job
dependencies:
- gcc:stretch:amd64
- gcc:sid:amd64
only:
- merge_requests
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
unit:gcc:sid:amd64:
<<: *debian_sid_amd64_image
......@@ -287,17 +300,19 @@ unit:gcc:sid:amd64:
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
unit:asan:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- asan:sid:amd64
gcc:sid:i386:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--with-libidn2 --without-python"
<<: *debian_sid_i386_image
<<: *build_job
unit:clang:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *unit_test_job
system:gcc:sid:i386:
<<: *debian_sid_i386_image
<<: *system_test_job
dependencies:
- clang:stretch:amd64
- gcc:sid:i386
unit:gcc:sid:i386:
<<: *debian_sid_i386_image
......@@ -305,39 +320,53 @@ unit:gcc:sid:i386:
dependencies:
- gcc:sid:i386
system:gcc:centos6:amd64:
<<: *centos_centos6_amd64_image
gcc:xenial:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
<<: *ubuntu_xenial_amd64_image
<<: *build_job
system:gcc:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *system_test_job
dependencies:
- gcc:centos6:amd64
- gcc:xenial:amd64
system:gcc:centos7:amd64:
<<: *centos_centos7_amd64_image
<<: *system_test_job
unit:gcc:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *unit_test_job
dependencies:
- gcc:centos7:amd64
- gcc:xenial:amd64
system:gcc:jessie:amd64:
<<: *debian_jessie_amd64_image
gcc:bionic:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--with-libidn2"
<<: *ubuntu_bionic_amd64_image
<<: *build_job
system:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
<<: *system_test_job
dependencies:
- gcc:jessie:amd64
- gcc:bionic:amd64
system:gcc:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *system_test_job
unit:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
<<: *unit_test_job
dependencies:
- gcc:stretch:amd64
- gcc:bionic:amd64
system:gcc:sid:amd64:
asan:sid:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g -fsanitize=address,undefined -DISC_MEM_USE_INTERNAL_MALLOC=0"
LDFLAGS: "-fsanitize=address,undefined"
EXTRA_CONFIGURE: "--with-libidn2"
<<: *debian_sid_amd64_image
<<: *system_test_job
dependencies:
- gcc:sid:amd64
only:
- merge_requests
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
<<: *build_job
system:asan:sid:amd64:
<<: *debian_sid_amd64_image
......@@ -345,23 +374,33 @@ system:asan:sid:amd64:
dependencies:
- asan:sid:amd64
system:gcc:sid:i386:
<<: *debian_sid_i386_image
<<: *system_test_job
unit:asan:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- gcc:sid:i386
- asan:sid:amd64
install:gcc:sid:amd64:
<<: *debian_sid_amd64_image
stage: test
script:
- make install
clang:stretch:amd64:
variables:
CC: clang
CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
EXTRA_CONFIGURE: "--with-python=python3"
<<: *debian_stretch_amd64_image
<<: *build_job
unit:clang:stretch:amd64:
<<: *debian_stretch_amd64_image
<<: *unit_test_job
dependencies:
- gcc:sid:amd64
only:
- merge_requests
- master@isc-projects/bind9
- /^v9_.*$/@isc-projects/bind9
- clang:stretch:amd64
clang:stretch:i386:
variables:
CC: clang
CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
EXTRA_CONFIGURE: "--with-python=python2"
<<: *debian_stretch_i386_image
<<: *build_job
pkcs11:sid:amd64:
variables:
......@@ -371,15 +410,15 @@ pkcs11:sid:amd64:
<<: *debian_sid_amd64_image
<<: *build_job
unit:pkcs11:sid:amd64:
system:pkcs11:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
<<: *system_test_job
dependencies:
- pkcs11:sid:amd64
system:pkcs11:sid:amd64:
unit:pkcs11:sid:amd64:
<<: *debian_sid_amd64_image
<<: *system_test_job
<<: *unit_test_job
dependencies:
- pkcs11:sid:amd64
......@@ -391,53 +430,14 @@ noassert:sid:amd64:
<<: *debian_sid_amd64_image
<<: *build_job
unit:noassert:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- noassert:sid:amd64
system:noassert:sid:amd64:
<<: *debian_sid_amd64_image
<<: *system_test_job
dependencies:
- noassert:sid:amd64
gcc:xenial:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
<<: *ubuntu_xenial_amd64_image
<<: *build_job
unit:gcc:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *unit_test_job
dependencies:
- gcc:xenial:amd64
system:gcc:xenial:amd64:
<<: *ubuntu_xenial_amd64_image
<<: *system_test_job
dependencies:
- gcc:xenial:amd64
gcc:bionic:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--with-libidn2"
<<: *ubuntu_bionic_amd64_image
<<: *build_job
unit:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
unit:noassert:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- gcc:bionic:amd64
system:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
<<: *system_test_job
dependencies:
- gcc:bionic:amd64
- noassert:sid:amd64
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