The branch, master has been updated via dd178d97250 .gitlab-ci: Increase build timeout via 7857e1249b7 .gitlab-ci.yml: Honour AUTOBUILD_SKIP_SAMBA_O3 in GitLab CI from fc2347be4ed Fix detection of rpc/xdr.h on macOS
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit dd178d97250e041b29aad9b26d2994163bd99231 Author: Joseph Sutton <josephsut...@catalyst.net.nz> Date: Mon Oct 11 15:37:48 2021 +1300 .gitlab-ci: Increase build timeout While the build will not take > 1hr, uploading the artifacts needed to pass the build objects to the next stage can take some time due to the distance between the runners and the private CI server. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861 Signed-off-by: Joseph Sutton <josephsut...@catalyst.net.nz> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Wed Oct 13 12:00:03 UTC 2021 on sn-devel-184 commit 7857e1249b72be8c8841b99cb0820c9c563178f9 Author: Andrew Bartlett <abart...@samba.org> Date: Tue Oct 12 07:55:54 2021 +1300 .gitlab-ci.yml: Honour AUTOBUILD_SKIP_SAMBA_O3 in GitLab CI GitLab CI resources are expensive and often rationed so provide a way to test other things without testing an -O3 build also, as this will save 9 jobs. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-default.yml | 1 + .gitlab-ci-main.yml | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: 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..a75305c7f5a 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -169,7 +169,7 @@ others: .shared_template_build_only: extends: .shared_template - timeout: 1h + timeout: 2h artifacts: expire_in: 1 week paths: @@ -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 -- Samba Shared Repository