From 494a97e985c8bce31730b5208a9bfba872f2638a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Mon, 16 Mar 2020 11:32:46 +0100 Subject: [PATCH] Move FreeBSD CI jobs to libvirt-based executors To get rid of the currently used FreeBSD-specific executor, move FreeBSD CI jobs to libvirt-based executors. Make the necessary tag and variable adjustments. (cherry picked from commit 80618b53782f9bdd105b05f17496c86938a6657f) --- .gitlab-ci.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec5bea5060..e45614d71a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ stages: .freebsd-amd64: &freebsd_amd64 tags: - - freebsd + - libvirt - amd64 .linux-amd64: &linux_amd64 @@ -927,12 +927,16 @@ unit:pkcs11:sid:amd64: clang:freebsd11.3:amd64: variables: CFLAGS: "${CFLAGS_COMMON}" + USER: gitlab-runner <<: *freebsd_amd64 <<: *build_job system:clang:freebsd11.3:amd64: <<: *freebsd_amd64 <<: *system_test_job + variables: + USER: gitlab-runner + TEST_PARALLEL_JOBS: 4 dependencies: - clang:freebsd11.3:amd64 needs: ["clang:freebsd11.3:amd64"] @@ -940,6 +944,8 @@ system:clang:freebsd11.3:amd64: unit:clang:freebsd11.3:amd64: <<: *freebsd_amd64 <<: *unit_test_job + variables: + USER: gitlab-runner dependencies: - clang:freebsd11.3:amd64 needs: ["clang:freebsd11.3:amd64"] @@ -950,12 +956,16 @@ clang:freebsd12.1:amd64: variables: CFLAGS: "${CFLAGS_COMMON}" EXTRA_CONFIGURE: "--enable-dnstap" + USER: gitlab-runner <<: *freebsd_amd64 <<: *build_job system:clang:freebsd12.1:amd64: <<: *freebsd_amd64 <<: *system_test_job + variables: + USER: gitlab-runner + TEST_PARALLEL_JOBS: 4 dependencies: - clang:freebsd12.1:amd64 needs: ["clang:freebsd12.1:amd64"] @@ -963,6 +973,8 @@ system:clang:freebsd12.1:amd64: unit:clang:freebsd12.1:amd64: <<: *freebsd_amd64 <<: *unit_test_job + variables: + USER: gitlab-runner dependencies: - clang:freebsd12.1:amd64 needs: ["clang:freebsd12.1:amd64"]