summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fail-danger-in-ci' into 'master'Rémy Coutable2018-12-171-1/+0
| | | | | | | Don't allow Danger to fail in CI any more Closes gitlab-org/release/framework#21 See merge request gitlab-org/gitlab-ce!23695
* Merge branch 'sh-disble-docs-internal-links-lint' into 'master'Clement Ho2018-12-171-1/+2
| | | | | | | Disable docs lint internal_links check Closes #55038 See merge request gitlab-org/gitlab-ce!23665
* Merge branch 'add-docs-lint-back' into 'master'Stan Hu2018-12-121-2/+1
| | | | | | | | | | | Docs: Enable gitlab-docs lint Closes gitlab-com/gitlab-docs#305 See merge request gitlab-org/gitlab-ce!23748 (cherry picked from commit e7a6b841684f9a2929b16176b223ea44bfc26332) 9ab53261 Enable `bundle exec nanoc check internal_links`
* Disable docs lint internal_links checkStan Hu2018-12-071-1/+2
| | | | | | | | | | | | | | | | | | | | This check never worked once the global navigation changes were rolled out in https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/362. The global nav will ALWAYS include /ce and /ee links, and the CE and EE repos will never include documentation for both. gitlab-docs now expects the documentation to be in the following directories: * /tmp/gitlab-docs/ce (CE) * /tmp/gitlab-docs/ee (EE) * /tmp/gitlab-docs/omnibus (Omnibus) The problem is that the CE and EE repos will only include one of the first two. Let's disable this check until https://gitlab.com/gitlab-com/gitlab-docs/issues/305 is resolved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55038
* Retry the review-{deploy,qa} jobs twiceRémy Coutable2018-12-061-2/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Remove merge:master job entirelyYorick Peterse2018-12-051-24/+0
| | | | | | | Apparently disabling it by checking for a variable doesn't actually disable it. [ci skip]
* Merge branch 'winh-add-jest' into 'master'Mike Greiling2018-12-051-0/+26
|\ | | | | | | | | Setup Jest test environment See merge request gitlab-org/gitlab-ce!23406
| * Setup Jest test environmentWinnie Hellmann2018-12-051-0/+26
| |
* | Do not attempt retry until allow_failure has been removedddavison2018-12-041-1/+1
| |
* | Allow review app smoke test to fail for nowMek Stittri2018-12-041-0/+1
| |
* | Temporarily disable automatic mergingYorick Peterse2018-12-041-0/+1
| | | | | | | | | | | | | | | | | | It appears that for some jobs (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/129705025 for example) we process a range of commits far greater than necessary, which can lead to commits getting reverted that were merged a long time ago. [ci skip]
* | Merge branch 'merge-train' into 'master'Rémy Coutable2018-12-041-0/+24
|\ \ | | | | | | | | | | | | Automatically merge CE master into EE master See merge request gitlab-org/gitlab-ce!23453
| * | Automatically merge CE master into EE masterYorick Peterse2018-12-041-0/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up GitLab CI to automatically push CE master changes into EE master, or revert them if the changes cause merge conflicts. The CI configuration contains a single job to do this: `merge:master`. This job is executed for every push to master, and periodically using a CI schedule. The periodic job is necessary because incremental jobs may not be able to revert commits if newly added commits depend on these commits. By re-running the job periodically (including all changes since a large enough time frame), we can ensure that such commits are also reverted (if they still conflict at that time). The job runs in its own "merge" stage, _after_ the build and prepare stages, but _before_ running the tests. This ensures that randomly failing tests won't prevent code from being merged into EE. Running the stage after the "prepare" stage reduces the chances of the job reverting CE changes just because it ran before a corresponding EE MR was merged into EE master.
* | Fixes a typo that prevented assets from being properly compiledDJ Mountney2018-12-041-1/+1
|/ | | For CE on dev.gitlab.org
* Retry the review-qa-smoke job twiceRémy Coutable2018-11-291-0/+2
| | | | | | Also, enable debug mode. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '49570-add-review_qa-job' into 'master'Sean McGivern2018-11-281-48/+108
|\ | | | | | | | | | | | | Add an automatic job to run QA smoke tests against Review Apps Closes #49570 See merge request gitlab-org/gitlab-ce!22853
| * Add a manual job to run QA against a Review App49570-add-review_qa-jobRémy Coutable2018-11-261-48/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Renames review to review-deploy. 2. Renames stop_review to review-stop. 3. Adds a build-qa-image job to the prepare stage and save the QA Docker image as artifact (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967019). 4. Adds a manual review-qa job to the test stage to run QA tests against the Review App (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967238). 5. Make the review-deploy job plays the review-qa job as soon as the Review App is deployed (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120988775). 6. Updates the Review Apps documentation accordingly. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Exclude qa-frontend from running on docs-only branchesdocs/exclude-qa-frontendAchilleas Pipinellis2018-11-231-0/+1
|/
* Include wildcard for `gitlab:assets:compile` only parameterGeorge Tsiolis2018-11-221-4/+4
|
* Limit `gitlab:assets:compile` job to branchesGeorge Tsiolis2018-11-221-0/+5
|
* Add dedicated runner tags to assets jobrs-asset-compilation-tagsRobert Speicher2018-11-201-1/+2
| | | | | | | | | | | Ordinarily it would get the `gitlab-org` tag from `dedicated-no-docs-pull-cache-job`, but adding the `docker` tag overwrites rather than inherits, so this job has been running on the underpowered hardware of the shared runners rather than our dedicated runners. We're also adding a `high-cpu` tag, which doesn't currently do anything but will be useful for targeting a runner specifically for this job.
* Merge branch 'rs-moar-runners' into 'master'Kamil Trzciński2018-11-191-4/+4
|\ | | | | | | | | Increase rspec parallelization to 50 See merge request gitlab-org/gitlab-ce!23149
| * Increase rspec parallelization to 50rs-moar-runnersRobert Speicher2018-11-161-4/+4
| |
* | Provide application.css from master branch via GitLab PagesWinnie Hellmann2018-11-161-0/+2
| |
* | Merge branch '53813-test-compilation-against-multiple-node-versions' into ↵Mike Greiling2018-11-161-0/+33
|\ \ | |/ |/| | | | | | | | | | | | | 'master' Check compilation of FE assets against multiple node versions Closes #53813 See merge request gitlab-org/gitlab-ce!23068
| * Check compilation of FE assets against multiple node versions53813-test-compilation-against-multiple-node-versionsLukas Eipert2018-11-141-0/+33
| |
* | Merge branch 'conditionally-build-assets-image' into 'master'Rémy Coutable2018-11-151-0/+1
|\ \ | | | | | | | | | | | | Add BUILD_ASSETS_IMAGE CI variable See merge request gitlab-org/gitlab-ce!23076
| * | Add BUILD_ASSETS_IMAGE CI variableIan Baum2018-11-151-0/+1
| |/ | | | | | | | | | | * Defaults to FALSE * Can be used to disable building/pushing the assets image in the gitlab:compile:assets job
* | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-151-128/+19
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Update to new security report syntaxleipert-master-patch-67614Lukas Eipert2018-11-141-3/+6
| |
* | Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-75/+75
|\ | | | | | | | | | | | | Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
| * Fix trigerring of rails 4 tests in CIJan Provaznik2018-11-141-1/+1
| |
| * Switch rails 4 to 5 in gitlab-ciJan Provaznik2018-11-141-74/+74
| | | | | | | | | | | | | | | | | | CI jobs will be triggered both with rails 4 and 5 to make sure we keep backward compatibility if it turns out we have to switch back to rails 4. Rails 4 jobs are not allowed to fail for now, these jobs will be removed in a follow-up MR next cycle.
* | Merge branch 'move-assets-compile-sooner' into 'master'Marin Jankovski2018-11-141-1/+1
|\ \ | |/ |/| | | | | | | | | Move cloud-native-image to the post-test stage Closes charts/gitlab#897 See merge request gitlab-org/gitlab-ce!22942
| * Removing extra option for gitlab:assets:compilemove-assets-compile-soonerIan Baum2018-11-131-1/+0
| | | | | | | | * Don't need to specify stage as it is inherited from the job template
| * Move cloud-native-image job to the post-test stageIan Baum2018-11-131-1/+2
| | | | | | | | | | | | | | * The job depends on asset image created as part of the gitlab:assets:compile job. https://gitlab.com/charts/gitlab/issues/897
* | Upgrade to Ruby 2.5.3sh-bump-ruby-2.5.3Stan Hu2018-11-131-7/+9
|/ | | | | | | | | | | | | | | Attempt to update google-protobuf for migration-paths Because the one we were using aren't compatible with Ruby 2.5.3, and it'll be troublesome to switch Ruby. Upgrading google-protobuf will be much easier. All of them will need to be updated for Ruby 2.5.3 We remove oj because we don't really need it and it doesn't compile on 2.5.3 with that version. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
* Merge branch 'leipert-upgrade-node-yarn' into 'master'Tim Zallmann2018-11-131-3/+3
|\ | | | | | | | | Upgrade to node v10.x and yarn 1.12.x See merge request gitlab-org/gitlab-ce!22979
| * Upgrade to node v10.xleipert-upgrade-node-yarnLukas Eipert2018-11-121-3/+3
| |
* | Remove unnecessary job dependenciesleipert-remove-unnecessary-dependenciesLukas Eipert2018-11-101-3/+5
|/
* Ensure we create the secrets at the right time53621-review-app-credentials-does-not-reliably-workRémy Coutable2018-11-091-1/+0
| | | | | | | | | | | | In `deploy`, if the previous deployment failed, we delete/cleanup all the objects related to the release, including secrets. The problem is that if we create the root password before that, it will be then recreated during the deploy with a random value! By creatigng the secret just before actually deplying a new release, we ensure that it won't be overriden. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'add-docker-assets-image' into 'master'Robert Speicher2018-10-311-0/+8
|\ | | | | | | | | Build an assets only container See merge request gitlab-org/gitlab-ce!22235
| * Build a docker container storing only the frontent assetsIan Baum2018-10-311-0/+8
| | | | | | | | | | | | | | | | | | * Run as part of gitlab:assets:compile job * Will be used by omnibus-gitlab and the CNG images to avoid compiling multiple times https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22235
* | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-301-1/+1
| |
* | Review apps cleanup schedule runs on masterMarin Jankovski2018-10-251-1/+0
|/
* Merge branch 'sh-bump-ruby-2.4.5' into 'master'Robert Speicher2018-10-241-3/+3
|\ | | | | | | | | Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
| * Upgrade to Ruby 2.4.5Stan Hu2018-10-241-3/+3
| |
* | Remove unused rails5-variablesremove-unused-rails5-variablesLin Jen-Shin2018-10-241-6/+0
|/ | | | They're no longer used and have no effect
* Fix the schedule:review_apps_cleanup jobadd-review-appRémy Coutable2018-10-231-1/+6
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status