Commit Graph
251 Commits
Author SHA1 Message Date
Achilleas PipinellisandRémy Coutable 1e34a81cd4 Merge branch 'expiry' into 'master'
Clarify artifact expiry

## What does this MR do?

Clarifies documentation about artifact expiry.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4831

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:54:31 +02:00
Achilleas PipinellisandRémy Coutable f81259d136 Merge branch 'ci-git' into 'master'
Document `GIT_STRATEGY` and `GIT_DEPTH`

## What does this MR do?

Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working.

## Are there points in the code the reviewer needs to double check?

The TOC and the location of the new entries.

## Why was this MR needed?

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Screenshots (if relevant)

![image](/uploads/eccfd60199d81e6588c13aab817f0eb5/image.png)

![image](/uploads/bbbffe61db64ef17f1fa52907275f3d4/image.png)

/cc @axil @ayufan

See merge request !4720

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:45:15 +02:00
Achilleas PipinellisandRémy Coutable bdaced56b4 Merge branch 'ci-wording' into 'master'
* Adds pipelines page to CI docs.
* Adds image of pipelines list (although currently missing border that is on other images).
* Changes CI to CI/CD in `/doc` and `/doc/ci`
* Sorts user documentation in `/doc`

Partially fixes #17733.

See merge request !4660

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22 15:43:46 +02:00
Rémy CoutableandRobert Speicher e4938c6ed2 Merge branch 'feature/runner-lock-on-project' into 'master'
Make it possible to lock runner on a specific project

Make it possible to lock runner on a specific project.

![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png)

----

![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png)

----

![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png)

Closes #3407

See merge request !4093
2016-06-21 12:17:20 -04:00
Achilleas PipinellisandRobert Speicher 5a9f1e242b Merge branch 'document-environments' into 'master'
Document environments and deployments

## What does this MR do?

Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #18683.

## Screenshots (if relevant)

![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png)

![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png)

/cc @ayufan @axil 

See merge request !4725
2016-06-20 11:51:42 -04:00
Achilleas PipinellisandRobert Speicher fc6fd97c51 Merge branch 'grammar-tweaks' into 'master'
Grammar tweaks

## What does this MR do?

* Updates grammar in recent CI documentation.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Because grammar.

## What are the relevant issue numbers?

Needed because of !4200 and !4201.

## Screenshots (if relevant)


See merge request !4772
2016-06-20 10:15:49 -04:00
Achilleas PipinellisandRobert Speicher e6595e4df3 Merge branch 'ci-scala-example' into 'master'
Ci scala example

## What does this MR do?

Add a scala CI example.

## Why was this MR needed?

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2984

See merge request !4774
2016-06-18 12:37:17 -04:00
Rémy Coutable be09845914 Merge branch 'environments-and-deployments' into 'master'
Add environments and deployments

This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009.

The current implementation is as follow:
1. We have two new tables: `environments` and `deployments`.
2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one.
3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment.
4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed)
5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment.
6. User have to create environments that he will track first.
7. User can remove environments.
8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment.
9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources.
10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`.

The `.gitlab-ci.yml`:
```
deploy to production:
  stage: deploy
  script: dpl travis...
  environment: production
```

What needs to be done:
- [x] Write initial implementation
- [x] Improve implementation (@ayufan)
- [x] Write tests (@ayufan)
- [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack
- [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill 
- [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan
- [ ] Write user documentation (@ayufan and @markpundsack)

See merge request !4605
2016-06-15 13:48:09 +00:00
Mark Pundsack 6d9ed76419 Document CI_BUILD_TOKEN 2016-06-14 21:26:38 -07:00
Kamil Trzcinski 006b650988 Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
#	db/schema.rb
2016-06-14 16:19:29 +02:00
Rémy Coutable 95a7fbe97c Merge branch 'artifacts-expire-date' into 'master'
Artifacts expire date

What do you think @grzesiek?

The syntax will be simple:
```
job:
  artifacts:
    expire_in: 7d
```

- [x] Implement `expire_in`
- [x] Check current design of expiry information with @jschatz1 and @markpundsack 
- [x] Add tests in GitLab application for a `ExpireBuildArtifactsWorker` and for `ArtifactsController::keep`
- [x] Add user documentation how to use `artifacts:expire_in`
- [x] Prepare GitLab Runner changes to pass `expire_in`: gitlab-org/gitlab-ci-multi-runner!191
- [x] Fix `timeago` with help of @jschatz1
- [x] Merge latest master after builds view changes @iamphill
- [ ] Add Omnibus support for `expire_build_artifacts_worker` cron job
- [ ] Add documentation how to configure `expire_build_artifacts_worker`

This is based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4201.

See merge request !4200
2016-06-14 13:40:01 +00:00
Kamil Trzcinski 975e388751 Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
#	lib/ci/gitlab_ci_yaml_processor.rb
2016-06-14 14:53:10 +02:00
Kamil Trzcinski 3f5819fb7a Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-14 14:49:59 +02:00
Achilleas Pipinellis 47c9b7d34c Update CI API docs
- Move ci/api under api/ci
- Clean up builds.md and runners.md
- Replace old links with new ones
- Add CI API links in ci/README.md
2016-06-14 14:47:32 +02:00
Kamil Trzcinski e129f66d9e Add gitlab-ci.yml documentation for environments 2016-06-14 14:43:16 +02:00
Mark Pundsack 6ed7fcad29 Remove our 2016-06-13 22:47:54 -07:00
Mark Pundsack 8df7d90d5a De-note-ify 2016-06-13 22:45:43 -07:00
Mark Pundsack aefb08cb6a Clarify dind example 2016-06-13 22:42:46 -07:00
Mark Pundsack 4c571041de Make minor grammar change 2016-06-13 22:36:28 -07:00
Mark Pundsack f95791d411 Make Achilleas' suggested changes 2016-06-13 22:32:01 -07:00
Mark Pundsack a7caea9e3e Use docker:latest 2016-06-13 22:06:13 -07:00
Mark Pundsack 35ce04ef2e Move registry CI example to CI docs 2016-06-13 22:06:13 -07:00
Mark Pundsack 6f834ecaa9 Reformat notes 2016-06-13 22:06:13 -07:00
Mark Pundsack b0cbeb18d1 Remove unnecessary message 2016-06-13 22:06:13 -07:00
Mark Pundsack b393478f63 Refactor notes 2016-06-13 22:06:13 -07:00
Mark Pundsack 1c02ef9c14 Drop some 'however's 2016-06-13 22:06:13 -07:00
Mark Pundsack 46114eddf0 Add more pros and cons for each docker approach 2016-06-13 22:06:13 -07:00
Mark Pundsack e97af053eb Fix docker volume 2016-06-13 22:06:13 -07:00
Mark Pundsack db656a3987 Fix more references to old gitlab-runner 2016-06-13 22:06:13 -07:00
Mark Pundsack 6ca1370c92 Fix more instructions 2016-06-13 22:06:13 -07:00
Mark Pundsack 9b30f26b98 Fix runner CLI instructions 2016-06-13 22:06:13 -07:00
Mark Pundsack 8412844108 Fix instructions 2016-06-13 22:06:13 -07:00
Mark Pundsack d9cbe01986 Moar commas 2016-06-13 22:06:13 -07:00
Mark Pundsack 6841e76b45 Add notes 2016-06-13 22:06:13 -07:00
Mark Pundsack d7664c7223 Add example using GitLab Container Registry 2016-06-13 22:06:13 -07:00
Mark Pundsack 4209212bb8 Add docker bind-mount as an option 2016-06-13 22:06:13 -07:00
Kamil TrzcinskiandPhil Hughes cf9c5b54c6 Added documentation to artifacts expire 2016-06-13 11:09:19 +01:00
Kamil TrzcinskiandPhil Hughes d23b91b0d9 Improve after review 2016-06-13 11:08:15 +01:00
Kamil TrzcinskiandPhil Hughes 897bc59761 Added description of artifacts:when 2016-06-13 11:03:30 +01:00
Kamil Trzcinski 3714e1914b Improve after review 2016-06-10 21:25:48 +02:00
Kamil Trzcinski e6209a407e Added description of artifacts:when 2016-06-10 13:26:36 +02:00
Aurelio Jargas d7e714e4fd Fix typo 2016-05-27 21:28:45 +00:00
Robert Speicher f26389a02a Merge branch 'feature/runner-config-untagged-jobs' into 'master'
Add config for CI Runner that prevents it from picking untagged jobs

Closes #3456

See merge request !4039
2016-05-19 21:54:33 +00:00
Jeroen van Baarsen c50e7b1202 Merge branch 'fix/after-script-documentation-update' into 'master'
Update 'after_script' introduction note

Related to gitlab-org/gitlab-ci-multi-runner#1321

See merge request !4205
2016-05-19 21:00:12 +00:00
Grzegorz Bizon bf9cc351c2 Add minor corrections related to config of runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon b253aa32c7 Add docs for a new configuration setting for runner 2016-05-19 22:01:53 +02:00
Jeroen van Baarsen dea3680006 Merge branch 'doc-broken-links' into 'master'
Fix broken documentation links

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15249

- [x] `/help/ui`- This is working for me
- [x] `/help/ci/examples/deployment/README.md` - Fixed
- [x] `/help/ci/api/projects.md` - Fixed
- [x] `/help/markdown/LICENSE` - Cannot do much to fix it, added a note.
- [x] `/help/ci/ssh/README.md` - Cannot find this link referenced anywhere.

See merge request !3903
2016-05-19 17:32:04 +00:00
Tomasz Maczukin 01256eecfa Update 'after_script' introduction note 2016-05-18 21:34:58 -05:00
Dmitriy Zaporozhets 1227a1b239 Merge branch 'patch-1' into 'master'
Fix broken link in CI quickstart docs

The newline between the `[label]` and the `(link)` caused it to be interpreted literally: http://doc.gitlab.com/ce/ci/quick_start/README.html

See merge request !3541
2016-05-18 17:35:16 +00:00
Achilleas Pipinellis 429f537035 Merge branch 'patch-3' into 'master'
blost -> blog



See merge request !4063
2016-05-08 18:46:48 +00:00