From a4cce28bfa3c1d0cd7e05c4628f6931eef8ce69f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 20 Apr 2021 07:45:31 +1200 Subject: [PATCH] .gitlab-ci.yml: Always build the ubuntu1804-samba-o3 with --enable-coverage This ensures that the coverage build always works, as it can trigger different warnings. Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- .gitlab-ci-main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 757c6824b97..b0f81e674bb 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -489,11 +489,18 @@ coverity: # This job, which matches the main CI, needs to still do coverage so # we show the coverage on the "none" environment tests +# +# We want --enable-coverage specified here otherwise we will have a +# different set of build options on the coverage build and can fail +# when -O3 gets combined with --enable-coverage in the scheduled +# builds. + ubuntu1804-samba-o3: extends: .shared_template variables: AUTOBUILD_JOB_NAME: samba-o3 SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804} + SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE: "--enable-coverage" # All other jobs do not want code coverage. .samba-o3-template: -- 2.34.1