The branch, master has been updated
via 8ab0238abd1 .gitlab-ci: Avoid duplicate CI on all merge requests
via bcc22d00569 .gitlab-ci.yml: Restore building most of our jobs
from dd178d97250 .gitlab-ci: Increase build timeout
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8ab0238abd171f9a11b013fd185605e7d1722b27
Author: Andrew Bartlett
Date: Thu Oct 14 08:51:21 2021 +1300
.gitlab-ci: Avoid duplicate CI on all merge requests
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861
Signed-off-by: Andrew Bartlett
Reviewed-by: Douglas Bagnall
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Thu Oct 14 01:21:11 UTC 2021 on sn-devel-184
commit bcc22d00569551cfa25851c8c267ec9decc63d21
Author: Andrew Bartlett
Date: Thu Oct 14 08:11:49 2021 +1300
.gitlab-ci.yml: Restore building most of our jobs
We are changing the primary build jobs to use "when"
not "only". These a similar and related GitLab syntax
tools to control when jobs are run.
With 'when' now in use it must be specified on all jobs
that inherit from each other via:
.extends .shared_template
"only" can be left however for the pages and coverity as
these use:
.extends .shared_runner_build_image
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861
Signed-off-by: Andrew Bartlett
Reviewed-by: Douglas Bagnall
---
Summary of changes:
.gitlab-ci-main.yml | 32
1 file changed, 24 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index a75305c7f5a..d876923f9e7 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -83,6 +83,13 @@ include:
interruptible: true
timeout: 2h
+ # Otherwise we run twice, once on push and once on MR
+ # https://forum.gitlab.com/t/new-rules-syntax-and-detached-pipelines/37292
+ rules:
+- if: $CI_MERGE_REQUEST_ID
+ when: never
+- when: on_success
+
variables:
AUTOBUILD_JOB_NAME: $CI_JOB_NAME
stage: build
@@ -353,13 +360,16 @@ samba-fips:
.private_test_only:
extends: .private_runner_test
stage: test_private
- only:
-variables:
+ rules:
+ # See above, to avoid a duplicate CI on the MR (these rules override the
others)
+- if: $CI_MERGE_REQUEST_ID
+ when: never
+
# These jobs are only run if the gitlab repo has private runners
available.
# To enable private jobs, you must add the following var and value to
# your gitlab repo by navigating to:
# settings -> CI/CD -> Environment variables
- - $SUPPORT_PRIVATE_TEST == "yes"
+- if: $SUPPORT_PRIVATE_TEST == "yes"
.needs_samba-def-build-private:
extends:
@@ -514,11 +524,14 @@ ubuntu1804-samba-o3:
AUTOBUILD_JOB_NAME: samba-o3
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804}
SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE: "--enable-coverage"
- only:
-variables:
- # do not run o3 builds (which run a lot of VMs) if told not to
- # (this uses the same variable as autobuild.py)
- - $AUTOBUILD_SKIP_SAMBA_O3 == "0"
+ rules:
+# See above, to avoid a duplicate CI on the MR (these rules override the
others)
+- if: $CI_MERGE_REQUEST_ID
+ when: never
+# do not run o3 builds (which run a lot of VMs) if told not to
+# (this uses the same variable as autobuild.py)
+- if: $AUTOBUILD_SKIP_SAMBA_O3 == "1"
+ when: never
# All other jobs do not want code coverage.
.samba-o3-template:
@@ -526,6 +539,9 @@ ubuntu1804-samba-o3:
variables:
AUTOBUILD_JOB_NAME: samba-o3
rules:
+# See above, to avoid a duplicate CI on the MR (these rules override the
others)
+- if: $CI_MERGE_REQUEST_ID
+ when: never
# do not run o3 builds (which run a lot of VMs) if told not to
# (this uses the same variable as autobuild.py)
- if: $AUTOBUILD_SKIP_SAMBA_O3 == "1"
--
Samba Shared Repository
