Commit Graph
3699 Commits
Author SHA1 Message Date
Drew Blessing 8033afd817 Update migration_style_guide.md with new details 2016-06-15 21:38:12 +00: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
Achilleas Pipinellis 870470730c Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master'
Add docs for assigning labels/milestone when moving issue

Extends https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3934

See merge request !4069
2016-06-15 09:36:19 +00:00
Grzegorz BizonandAchilleas Pipinellis 0daa6b4321 Add docs for assigning labels/milestone when moving issue
[ci skip]
2016-06-15 11:33:09 +02:00
Mark Pundsack 6d9ed76419 Document CI_BUILD_TOKEN 2016-06-14 21:26:38 -07:00
Stan Hu db6a75c23a Merge branch 'fix-sidekiq-troubleshooting' into 'master'
Fix typo in obtaining a backtrace from all threads in gdb



See merge request !4612
2016-06-14 23:52:47 +00:00
Patricio Cano 6023dc356a Revert "Added API endpoint for Sidekiq Metrics"
This reverts commit 06e0ef07bc
2016-06-14 16:46:53 +00:00
Patricio Cano 06e0ef07bc Added API endpoint for Sidekiq Metrics 2016-06-14 11:45:45 -05:00
Kamil Trzcinski 14a02a6a95 Improve design after review 2016-06-14 18:34:48 +02:00
Yorick Peterse f558bf0de4 Merge branch '18527-instrument-private-methods' into 'master'
Instrument private methods and instance private methods

See merge request !4639
2016-06-14 14:28:40 +00: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
Paco Guzman dadc531353 Instrument private/protected methods
By default instrumentation will instrument public,
protected and private methods, because usually
heavy work is done on private method or at least
that’s what facts is showing
2016-06-14 15:17:51 +02: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
Achilleas Pipinellis f2f5a115c6 Fix grammar and syntax 2016-06-14 14:50:25 +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
Kamil Trzcinski 3ade826065 Add specs for models and services 2016-06-14 13:51:12 +02:00
Yorick Peterse 4b964011cf Merge branch '18528-cpu-time-instrumentation' into 'master'
Measure CPU time for instrumented methods

See merge request !4640
2016-06-14 11:39:19 +00:00
Paco Guzman 120fbbd487 Measure CPU time for instrumented methods 2016-06-14 12:49:31 +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
Mark Pundsack 17eb51594d Fix some grammar 2016-06-13 22:06:13 -07:00
Kamil Trzcinski 0fab7b11ba Merge remote-tracking branch 'origin/master' into artifacts-when 2016-06-13 16:05:43 +02:00
Kamil Trzcinski f6de5937e3 Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-13 16:05:30 +02:00
Achilleas Pipinellis aa48eeef17 Merge branch 'doc-styleguide-move-locations' into 'master'
Add guide on changing a document's location

## What does this MR do?

Add a documentation styleguide when changing a document's location.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/3349


See merge request !4624
2016-06-13 13:26:43 +00:00
Achilleas Pipinellis cb7fa10cb5 Change to new Notes styleguide
[ci skip]
2016-06-13 15:04:22 +02:00
Achilleas Pipinellis d1abbb3b66 Add guide on changing a document's location
[ci skip]
2016-06-13 15:00:28 +02:00
Achilleas Pipinellis e489e9a585 Change logs.md location in README
[ci skip]
2016-06-13 14:19:29 +02:00
Achilleas Pipinellis 35e9fc9865 Move logs/logs.md to administration/logs.md
[ci skip]
2016-06-13 13:52:20 +02:00