diff options
author | Stefan Metzmacher <metze@samba.org> | 2020-12-29 10:21:51 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2021-04-13 08:23:35 +0000 |
commit | 6999e080ce0d5a0ab470daede88d7febafb49637 (patch) | |
tree | 67a9db24fdc0a1b6bda76ac190db168eced47c90 /.gitlab-ci-main.yml | |
parent | a0a1988afb3aa4b0064919ad02a1ef7f38f44d80 (diff) | |
download | samba-6999e080ce0d5a0ab470daede88d7febafb49637.tar.gz |
.gitlab-ci*.yml: only use gitlab.org shared runners if possible
We no longer fallback to our private runner, lets see how that works
out...
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to '.gitlab-ci-main.yml')
-rw-r--r-- | .gitlab-ci-main.yml | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index ccda2077a4d..e33b84a0ec7 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -73,6 +73,7 @@ include: - 'bootstrap/.gitlab-ci.yml' .shared_template: + extends: .shared_runner_build # All Samba jobs are interruptible, this avoids burning CPU when a # newer branch is pushed. interruptible: true @@ -82,9 +83,6 @@ include: AUTOBUILD_JOB_NAME: $CI_JOB_NAME image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG} stage: build - tags: - - docker - - shared cache: key: ccache.${CI_JOB_NAME} paths: @@ -194,7 +192,9 @@ others: - sha1sum samba-testbase.tar.gz .shared_template_test_only: - extends: .shared_template + extends: + - .shared_template + - .shared_runner_test stage: test_only script: # We unpack the artifacts file created by the .shared_template_build_only @@ -321,11 +321,9 @@ samba-fips: extends: .shared_template image: $SAMBA_CI_CONTAINER_IMAGE_fedora33 -.private_runner: +.private_test_only: + extends: .private_runner_test stage: test_private - tags: - - docker - - samba-ci-private only: variables: # These jobs are only run if the gitlab repo has private runners available. @@ -337,27 +335,27 @@ samba-fips: .needs_samba-def-build-private: extends: - .needs_samba-def-build - - .private_runner + - .private_test_only .needs_samba-mit-build-private: extends: - .needs_samba-mit-build - - .private_runner + - .private_test_only .needs_samba-h5l-build-private: extends: - .needs_samba-h5l-build - - .private_runner + - .private_test_only .needs_samba-nt4-build-private: extends: - .needs_samba-nt4-build - - .private_runner + - .private_test_only .needs_samba-no-opath-build-private: extends: - .needs_samba-no-opath-build - - .private_runner + - .private_test_only samba-fileserver: extends: .needs_samba-h5l-build-private @@ -376,11 +374,9 @@ samba-no-opath: # 'pages' is a special job which can publish artifacts in `public` dir to gitlab pages pages: + extends: .shared_runner_build image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG} stage: report - tags: - - docker - - shared dependencies: # tell gitlab to download artifacts for these jobs - others - samba @@ -422,11 +418,9 @@ pages: # Coverity Scan coverity: + extends: .shared_runner_build stage: build image: $SAMBA_CI_CONTAINER_IMAGE_fedora33 - tags: - - docker - - shared script: - wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz - tar xf /tmp/coverity_tool.tgz |