diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-11-21 09:26:28 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-11-21 09:26:28 +0000 |
| commit | 3d4ef136dacc1a7d09b6f159424b5bf06c719800 (patch) | |
| tree | 5e16b5b9679d12dbd3aa35aa149052487a9adb4d | |
| parent | 0133ff995d2cdff3d359dcf90244c240652908a3 (diff) | |
| parent | 5c3c90599450cc869aa5c9e7ba34faa051f59ab3 (diff) | |
| download | gitlab-ce-3d4ef136dacc1a7d09b6f159424b5bf06c719800.tar.gz | |
Merge branch 'rs-asset-compilation-tags' into 'master'
Add dedicated runner tags to assets job
See merge request gitlab-org/gitlab-ce!23242
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c662f42111..bb37b60b8f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -620,7 +620,8 @@ gitlab:assets:compile: - webpack-report/ - public/assets/ tags: - - docker + - gitlab-org-delivery + - high-cpu karma: <<: *dedicated-no-docs-pull-cache-job |