diff options
| -rw-r--r-- | .gitlab-ci-default.yml | 1 | ||||
| -rw-r--r-- | .gitlab-ci-main.yml | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/.gitlab-ci-default.yml b/.gitlab-ci-default.yml index d0831017d9b..e6089183674 100644 --- a/.gitlab-ci-default.yml +++ b/.gitlab-ci-default.yml @@ -3,6 +3,7 @@ variables: # "--enable-coverage" or "" # See .gitlab-ci-coverage.yml SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE: "" + AUTOBUILD_SKIP_SAMBA_O3: "0" include: - /.gitlab-ci-default-runners.yml diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 052618db5c5..7e295ea2151 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -514,16 +514,24 @@ 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" # All other jobs do not want code coverage. .samba-o3-template: extends: .shared_template variables: AUTOBUILD_JOB_NAME: samba-o3 - only: - variables: - # do not run o3 for coverage since they are using different images - - $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE == "" + rules: + # 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 + # do not run o3 for coverage since they are using different images + - if: $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE == "" ubuntu2004-samba-o3: extends: .samba-o3-template |