From 646bb642465c729f3d94c17b8ff4fde3f8c1afcf Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 10 Apr 2018 20:24:03 -0700 Subject: [PATCH 1/3] Add FreeBSD 11 GitLab CI Runner --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0eeae0977..df85a76b33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,6 +88,14 @@ stages: image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-i386" <<: *linux_i386 +# FreeBSD + +.freebsd-12-amd64: &freebsd_12_amd64_image + tags: + - freebsd12 + - amd64 + allow_failure: true + ### Job Templates .default-triggering-rules: &default_triggering_rules @@ -423,6 +431,24 @@ unit:gcc:bionic:amd64: dependencies: - gcc:bionic:amd64 +# Jobs for default CC builds on FreeBSD 12 (amd64) + +clang:freebsd12:amd64: + <<: *freebsd_12_amd64_image + <<: *build_job + +system:clang:freebsd12:amd64: + <<: *freebsd_12_amd64_image + <<: *system_test_job + dependencies: + - clang:freebsd12:amd64 + +unit:clang:freebsd12:amd64: + <<: *freebsd_12_amd64_image + <<: *unit_test_job + dependencies: + - clang:freebsd12:amd64 + # Jobs for GCC builds with ASAN enabled on Debian Sid (amd64) asan:sid:amd64: From 4d3e7d0b7d3d552aeae40f3c74e213b5013cff7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 2 Jul 2019 12:23:56 +0200 Subject: [PATCH 2/3] Use sudo to setup the interfaces when CI job is not running as root --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df85a76b33..2f93f784bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,13 +134,23 @@ autoconf: &autoconf_job untracked: true expire_in: "1 hour" +.setup_interfaces: &setup_interfaces | + if [ "$(id -u)" -eq "0" ]; then + bash -x bin/tests/system/ifconfig.sh up; + else + sudo bash -x bin/tests/system/ifconfig.sh up; + fi + +.setup_softhsm: &setup_softhsm | + bash -x util/prepare-softhsm2.sh + .system_test: &system_test_job <<: *default_triggering_rules stage: test retry: 2 before_script: - - bash -x bin/tests/system/ifconfig.sh up - - bash -x util/prepare-softhsm2.sh + - *setup_interfaces + - *setup_softhsm script: - ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 ) - test -s bin/tests/system/systests.output From e957825eeea45c34acd824c483da2d4c138b747a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 2 Jul 2019 12:51:49 +0200 Subject: [PATCH 3/3] Use $(pwd) instead of $CI_PROJECT_DIR to always get absolute path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f93f784bc..786380466c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,7 +163,7 @@ autoconf: &autoconf_job <<: *default_triggering_rules stage: test before_script: - - export KYUA_RESULT="$CI_PROJECT_DIR/kyua.results" + - KYUA_RESULT="$(pwd)/kyua.results" - bash -x util/prepare-softhsm2.sh script: - make unit