Commit Graph

106 Commits

Author SHA1 Message Date
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Rémy Coutable 004d335f26 Merge branch 'gitaly-test-bundle-path' into 'master'
Use existing BUNDLE_PATH for gitaly in local tests

See merge request !13493
2017-08-14 16:25:23 +00:00
Jacob Vosmaer fab0c1eb80 Use existing BUNDLE_PATH for gitaly in local tests 2017-08-11 15:49:50 +02:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Robert Speicher 420d835e5f Merge branch '36003-do-not-include-to-kernel' into 'master'
Don't include anything to Kernel only because of tasks

Closes #36003

See merge request !13380
2017-08-09 16:35:33 +00:00
Lin Jen-Shin 77f10d55de Properly set the expectation on the main object 2017-08-09 01:43:33 +08:00
Lin Jen-Shin 5d963fccab We shouldn't include utility methods everywhere 2017-08-08 23:14:29 +08:00
Jacob Vosmaer 5684528081 Unset BUNDLE_GEMFILE when installing Gitaly 2017-08-08 15:34:29 +02:00
Rémy Coutable feb8974cc8 Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'master'
Unset the `RUBYOPT` env variable before installing `gitaly-ruby`

Closes #35941 and #35967

See merge request !13313
2017-08-08 09:39:49 +00:00
Rémy Coutable 21937a157d
Print the setup steps and duration and fix an issue resulting in re-setuping GitLab Shell on each test run
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 17:27:50 +02:00
Rémy Coutable 201ce2cb55
Unset the RUBYOPT env variable before installing gitaly-ruby
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 16:10:52 +02:00
Rémy Coutable 805a28e6a1 Revert "Merge branch 'fix-gitaly-install' into 'master'"
This reverts commit 23c502b434, reversing
changes made to 1018ab0516.
2017-08-04 15:59:30 +02:00
Kim "BKC" Carlbäcker 4c68f22b0b fix tests 2017-08-04 13:54:41 +02:00
Rémy Coutable 532ad2e56e Don't call load_tasks as this would load the tasks twice
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-02 19:02:01 +02:00
Sean McGivern 90cb2aab38 Merge branch '28283-legacy-storage-format' into 'master'
[CE] Added Legacy Storage format

See merge request !13149
2017-08-01 12:24:24 +00:00
Jacob Vosmaer e99564568b CI fixes for gitaly-ruby 2017-08-01 10:48:46 +02:00
Gabriel Mazetto c6dee99803 Rename path_with_namespace -> disk_path when dealing with the filesystem 2017-08-01 07:26:58 +02:00
Alejandro Rodríguez c9c0606297 Improve version handling on component install tasks
Fixes an issue where, when using branch versions, the component wouldn't
be updated after the first branch checkout. We also save one step, since
checking out the FETCH_HEAD with `-f` already does what `reset --hard`
did.
2017-07-20 17:30:29 -04:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Jacob Vosmaer 218da88e1a Enable gitaly token auth when testing 2017-06-20 17:42:54 +02:00
Alejandro Rodríguez 58821ebbb4 Stop using deprecated `path` field on Gitaly messages
This revealed an error in our configuration generation in
gitlab:gitaly:install rake task. The fix is included
2017-06-14 19:33:43 -04:00
Rémy Coutable bdf5b6adc3
Enable the RSpec/ExpectOutput cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-18 18:56:26 +02:00
Jacob Vosmaer 43f037c903 Don't reuse gRPC channels
It seems that bad things happen when two gRPC stubs share one gRPC
channel so let's stop doing that. The downside of this is that we
create more gRPC connections; one per stub.
2017-05-15 10:52:33 +02:00
Stan Hu d36a409768 Relax rake backup regex to handle CE and EE RCs
See http://rubular.com/r/uTDlT85zW1
2017-05-12 13:00:03 -07:00
Stan Hu 5bed3390aa Fix failing backup filename spec for RCs
See http://rubular.com/r/9oI7K8b773 for more details.
2017-05-11 22:31:20 -07:00
Rémy Coutable d40e1f547e Enable the Style/TrailingCommaInLiteral cop
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
Jacob Vosmaer 3960d974c3 Compile gitlab-shell go executables 2017-05-04 11:21:51 +02:00
Kim "BKC" Carlbäcker 6f89bd3628 Use Gitaly for getting Branch/Tag counts
- Backup-rake-spec fixed. Storage config broken
- Use rugged to compare branch/tag-count in specs
- upgrade gitaly
2017-04-28 13:07:53 +02:00
Achilleas Pipinellis 3bce129570 Fix failing spec
http://rubular.com/r/op7TI9UX6K
2017-04-26 18:30:02 +02:00
Alejandro Rodríguez e61325ff43 Expand components version specification format to allow branches
Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly
using version strings, to which we prepend 'v' and assume are tags.
These changes allow branches or tags with other name formats to be
specified by prepending '=' to the version string (á la govendor).

We also simplify the process to reset to the given version (now a
branch or tag): Right now there's a check to supposedly try to avoid
fetching from the remote the version if it already exist locally. But
the previous logic already clones if the directory doesn't exist or
fetches if it does, so this check is pointless. We can safely assume the
version exists once we get to the reset stage.
2017-04-13 17:32:00 -03:00
Ahmad Sherif 62521f20e4 Add rake task that prints TOML storage configuration
Closes gitaly#173
2017-04-04 19:35:35 +02:00
Rémy Coutable 03538558d9 Merge branch 'rs-empty-project-misc' into 'master'
Use `:empty_project` in worker, view, task, serializer, policy, migration, and mailer specs

See merge request !10272
2017-03-30 12:06:23 +00:00
author Jacob Vosmaer jacob@gitlab.com 1490710538 +0200 6b8c2ea866 Allow backup tests to run locally 2017-03-29 14:48:06 +02:00
Jacob Vosmaer eee07f1c7c Expand relative paths in storages 2017-03-29 14:48:05 +02:00
Robert Speicher 02ccf750ee Use Project `:repository` trait where necessary in task specs 2017-03-27 18:45:36 -04:00
Jacob Vosmaer 6c3ce620a9 Remove unnecessary before block 2017-03-21 14:55:41 +01:00
Jacob Vosmaer 3883a5f906 Rake task that can install gitaly at a tag version 2017-03-21 14:55:41 +01:00
Sean McGivern a5db7f5425 Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard

See merge request !9597
2017-03-07 16:55:03 +00:00
Rémy Coutable 9533fc355c Merge branch 'add-git-version-to-system-info' into 'master'
Add git version to gitlab:env:info

Closes #25376

See merge request !9128
2017-03-07 10:05:02 +00:00
Pawel Chojnacki d13669c98b Remove remnants of git annex 2017-03-03 18:33:47 +01:00
Alejandro Rodríguez 0b9d56f960 Update storage settings to allow extra values per shard
This will be necessary when adding gitaly settings. This version
doesn't make any functional changes, but allows us to include this
breaking change in 9.0 and add the needed extra settings in the future
with backwards compatibility
2017-03-03 12:13:30 -03:00
Semyon Pupkov e73b68a742 Add git version to gitlab:env:info
https://gitlab.com/gitlab-org/gitlab-ce/issues/25376
2017-02-28 20:42:13 +05:00
James Edwards-Jones 1af3f3b673 Merge branch 'master' into jej-pages-picked-from-ee 2017-02-03 17:25:26 +00:00
Valery Sizov ceb1ebd959 Active tense test coverage
Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
2017-02-01 22:45:41 +00:00
Kamil Trzcinski 120f9abaa1 Add GitLab Pages
- The pages are created when build artifacts for `pages` job are uploaded
- Pages serve the content under: http://group.pages.domain.com/project
- Pages can be used to serve the group page, special project named as host: group.pages.domain.com
- User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project
- Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings
- The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB)
- The public/ is extracted from artifacts and content is served as static pages
- Pages asynchronous worker use `dd` to limit the unpacked tar size
- Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml
- Pages are part of backups
- Pages notify the deployment status using Commit Status API
- Pages use a new sidekiq queue: pages
- Pages use a separate nginx config which needs to be explicitly added
2017-01-31 22:50:39 +00:00
Adam Niedzielski 82692ea214 Restore backup correctly when "BACKUP" environment variable is passed 2017-01-09 18:38:53 +01:00
Drew Blessing e0eb86ee80 Add LDAP task to rename a provider
Sometimes admins will change the LDAP configuration, not realizing
that problems will occur if the user's LDAP identities are not
also updated to use the new provider name. This task will give
admins a single command to run to update identities and will
prevent having to run multiple Rails console queries.
2016-12-16 09:57:05 -06:00
Rémy Coutable 2c0bcefdc6
Don't allow to specify a repo or version when installing Workhorse
The task will use the canonical repo and the required version.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-01 19:22:46 +01:00
Douwe Maan 7633e4ae3f Merge branch '23718/backup-rake-task-human-readable' into 'master'
23718/backup rake task human readable

## What does this MR do?
Add the human readable format to the backup tar file. 
From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`.

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

## Why was this MR needed?
#23718 issue
## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
23718

See merge request !7188
2016-12-01 03:39:31 +00:00
Rémy Coutable b193e84974
Move task helpers to a module
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-30 12:20:21 +01:00