b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
ae69bdeaed
Merge branch 'review-app-optimizations' into 'master'
...
Refine the review-app custom variables
See merge request gitlab-org/gitlab-ce!32783
2019-09-10 21:45:13 +00:00
ac52c7ee74
Refine the review-app config variables
...
Add base-config.yaml to define non-environment
variable config for review app deploy. Define
resource requests and limits for all used apps
2019-09-10 13:54:58 -05:00
5a1659d884
Add review-cleanup-failed-deployment to prepare
...
Add in a job to purge previous release in Review App
2019-09-10 10:56:52 -05:00
f8f8ed471f
Merge branch '66428-make-review-app-deployment-use-wait' into 'master'
...
Make Review App deployment use `--wait` instead of `--atomic` for better debugging
Closes #66428
See merge request gitlab-org/gitlab-ce!32223
2019-09-04 10:31:45 +00:00
caceb797a6
Make download_chart function robust for its own Review App
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-09-04 02:31:11 +09:00
1593583337
Switch back to the '--wait' flag for the 'helm upgrade' command
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-09-03 18:06:45 +02:00
015efb0f71
Improve output for yarn integrity check
2019-09-03 14:06:57 +00:00
7d90f0f060
Use new location for helm charts repo
...
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-09-03 10:06:02 +05:30
bd3699dc6e
Removed duplicate functions from utils.sh
...
This change was made in EE in MR
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14802 , but this
was not backported to CE.
2019-08-09 15:34:06 +02:00
a74396dcc5
Add Gitaly and Rugged call timing in Sidekiq logs
...
This will help identify Sidekiq jobs that invoke excessive number of
filesystem access.
The timing data is stored in `RequestStore`, but this is only active
within the middleware and is not directly accessible to the Sidekiq
logger. However, it is possible for the middleware to modify the job
hash to pass this data along to the logger.
2019-08-09 01:08:32 -07:00
4541b44c36
Add script for frontend test file coverage
2019-08-08 07:31:43 +00:00
8f501a74bd
Remove the wait_for_review_app_to_be_accessible step from review-deploy
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-30 19:13:43 +02:00
9870e86f6c
Use the --atomic flag when deploying Review Apps
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-30 09:25:28 +02:00
d7a4c1d2a5
Backport EE changes made to the scripts/ directory
...
This backport changes made by EE to the files in the scripts/ directory.
This comes with a few changes to some scripts to make them work in the
single codebase setup.
2019-07-29 13:53:20 +02:00
aa9db9c869
Merge branch '54478-table_exists-not-compatible-with-rails-5-1' into 'master'
...
Resolve "table_exists? not compatible with Rails 5.1"
Closes #54478
See merge request gitlab-org/gitlab-ce!30832
2019-07-25 15:05:07 +00:00
72c1680424
Merge branch 'qa-stop-printing-dots-while-retrieving-pod-names-in-review-deploy' into 'master'
...
Stop printing dots while retrieving pod in review-apps.sh
See merge request gitlab-org/gitlab-ce!31062
2019-07-25 14:19:27 +00:00
2b3d00a778
Remove unneeded monkey-patch
...
Changes all calls to data_source_exists? to table_exists?
since that is the intent of these calls
2019-07-25 12:21:38 +08:00
c02c83fa9b
Merge branch '64998-increase-helm-deploy-command-timeout' into 'master'
...
Increase the Review App deploy command timeout to 15 minutes
Closes #64998
See merge request gitlab-org/gitlab-ce!31061
2019-07-24 14:29:21 +00:00
562db3a36e
Merge branch 'sh-add-rugged-to-peek' into 'master'
...
Add Rugged calls to performance bar
See merge request gitlab-org/gitlab-ce!30983
2019-07-24 12:24:12 +00:00
aef27e6acc
Merge branch '64996-fix-review-app-debugging' into 'master'
...
Resolve "Review App debugging sometimes fail because multiple Unicorn pods exist"
Closes #64996
See merge request gitlab-org/gitlab-ce!31058
2019-07-24 09:03:11 +00:00
291df05e43
Add Rugged calls to performance bar
...
This will help diagnose the source of excessive I/O from Rugged
calls. To implement this, we need to obtain the full list of arguments
sent to each request method.
2019-07-23 21:38:05 -07:00
28d9e87d40
Stop printing dots while retrieving pod in review-apps.sh
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-23 18:30:47 +02:00
b4f695da6b
Increase the Review App deploy timeout to 15 minutes
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-23 17:53:21 +02:00
4aa76dddec
Remove dead MySQL code
...
None of this code can be reached any more, so it can all be removed
2019-07-23 16:53:03 +01:00
dccf643c42
Fix Review App debugging
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-23 17:11:13 +02:00
b2f143597c
Extend yamllint test to changelogs
...
cc !30979
2019-07-23 12:23:51 +00:00
1136c0c8e9
Add Rugged calls and duration to API and Rails logs
...
This adds `rugged_duration_ms` and `rugged_calls` fields to
`api_json.log` and `production_json.log`. This will make it easier to
identify performance issues caused by excessive I/O.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64676
2019-07-18 06:53:39 -07:00
a1bee1a09d
Generate parallel spec reports
...
Creates reports for parallel specs and collates them into a single
HTML report and displays results on the merge request.
2019-07-17 10:12:56 -04:00
05b96f0b67
Fix link pointing to the documentation styleguide
...
Using the old link redirects to
https://docs.gitlab.com/ee/development/documentation/index.html
which does not show the mentioned documentation.
2019-07-16 06:46:07 +00:00
f69232d506
Merge branch '64356-pin-external-dns-version' into 'master'
...
ReviewApps: CI pin external-dns to 2.x version
Closes #64356
See merge request gitlab-org/gitlab-ce!30577
2019-07-12 15:24:04 +00:00
3c82d9fc8f
ReviewApps: CI pin external-dns to 2.x version
...
Pin the version of deployed external-dns to `2.y.z`, using SemVer
matching. (`^2.2.1`)
Update the properties for the service account keys per
*Upgrading to 2.0.0* of the `stable/external-dns` README.
Add `aws.batchChangeSize=400` to combat messages about RDATA being
too large.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64356
2019-07-12 09:53:41 -04:00
cb0edce20e
Merge branch 'rename-gitlab-docs-repo' into 'master'
...
Move the gitlab-docs project under gitlab-org
See merge request gitlab-org/gitlab-ce!30620
2019-07-12 11:43:30 +00:00
4085428ebd
Gather memory usage data in tests
...
Log memory stats after running each spec file and compile the report.
2019-07-12 10:44:17 +00:00
99f2c986b5
Move the gitlab-docs project under gitlab-org
...
Search and replace gitlab-com/gitlab-docs with gitlab-org/gitlab-docs.
For https://gitlab.com/gitlab-com/gitlab-docs/issues/310
2019-07-11 15:24:33 +03:00
77ff2249e4
Fix docs URL in trigger-build-docs puts text
2019-07-08 15:44:50 +00:00
29dbac2e12
Add resources requests and limits for all Review Apps resources
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-07-04 18:14:11 +02:00
f44719f39c
Get memory data after booting app in production
...
Preload the app in `production` env, hit it with a single request, and
gather total gem memory consumption data using `derailed exec perf:mem`
from `derailed_benchmarks`. Present the result as MR metrics.
2019-06-28 20:12:50 +03:00
7c38c0b4b2
Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"
...
This reverts merge request !30031
2019-06-28 15:55:54 +00:00
fb1d433703
Get memory data after booting app in production
...
Preload the app in `production` env, hit it with a single request, and
gather total gem memory consumption data using `derailed exec perf:mem`
from `derailed_benchmarks`. Present the result as MR metrics.
2019-06-28 13:49:57 +03:00
51011d1b2c
Merge branch 'improve-review-apps-cleanup-when-previous-deployment-failed' into 'master'
...
Improve Review Apps cleanup when previous deployment failed by only issuing an `helm delete` command
Closes #63639 and #62161
See merge request gitlab-org/gitlab-ce!28661
2019-06-25 14:00:47 +00:00
938db91322
Merge branch '62735-for-stable-branches-build-cng-images-from-corresponding-stable-branches-in-cng-mirror-project' into 'master'
...
Pass branch name to the CNG pipeline for stable branches
See merge request gitlab-org/gitlab-ce!29617
2019-06-25 11:18:54 +00:00
e266911019
Install Helm on dedicated nodes
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-06-25 11:09:06 +02:00
a90f12f77d
Let Helm handle the cleanup and print logs when deployment fails
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-06-25 11:09:06 +02:00
940fcc9ff2
Generate gem size metrics in memory CI
...
This includes several changes:
- Rename memory-static to generate-gems-size-metrics-static
- Rename memory-static-objects to generate-gems-memory-metrics-static
- Change generate-gems-size-metrics-static interface. The script now
expect `bundle exec derailed bundle:mem` output as its input. The
script output to stdout, or stderr for error message.
- Change generate-gems-memory-metrics-static interface. The script now
expect `bundle exec derailed bundle:objects` output as its input.
The script output to stdout, or stderr for error message.
- Generate gem size metrics. Script generate-gems-size-metrics-static
extract each gem size from `bundle exec derailed bundle:mem` output.
Save output to metrics file in format: 'gem_size_mb{name="zip"} 0.5'
2019-06-21 20:05:59 +10:00
bd9774e4d4
Add watch option to test script
2019-06-19 16:05:46 +00:00
7fd2d687db
Pass branch name to the CNG pipeline for stable branches
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-06-19 16:37:33 +02:00
c3b40ae131
Run static benchmarks from 'derailed_benchmarks'
...
Two static memory benchmarks will be included in our CI pipeline. It
will load gems from the Gemfile and check the amount of RAM consumed
as well as the number of objects allocated and retained.
Aggregated values will be included as 'metrics' into MRs while full
reports will be downloadable as job artifacts.
2019-06-19 12:16:44 +03:00
e6059b3d8d
Merge branch 'zj-disable-hooks-testing' into 'master'
...
Disable hooks by setting an ENV var
See merge request gitlab-org/gitlab-ce!29672
2019-06-17 17:32:58 +00:00
679ac7f78e
Disable hooks by setting an ENV var
...
Prior to this change, the hooks directory got cleared. That works, but
is not the way to go about it as there's a better way. Setting the env
var this commits sets.
2019-06-14 13:10:02 +02:00
7c1422c795
Apply suggestion to scripts/review_apps/review-apps.sh
2019-06-12 17:01:15 +00:00
115966335b
Pass FORCE_RAILS_IMAGE_BUILDS=true to the CNG triggered pipeline
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-06-12 13:22:12 +02:00
97037e4a11
[Review Apps] Set `global.imagePullPolicy: Always`
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-06-12 13:22:12 +02:00
21c809ce22
Merge branch '62151-broken-master' into 'master'
...
Fix MySQL CI jobs
Closes #62156 and #62151
See merge request gitlab-org/gitlab-ce!28593
2019-05-24 15:34:54 +00:00
57d9f88fd5
Merge branch '58869-unified-fe-test-script' into 'master'
...
Create a unified script to run Jest & Karma tests
Closes #58869
See merge request gitlab-org/gitlab-ce!27239
2019-05-23 17:32:56 +00:00
d02d3e34dd
Fix MySQL CI jobs
...
[run mysql]
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-22 21:47:32 +02:00
6145ddf515
Revert "Merge branch 'revert-04c3c6dd' into 'master'"
...
This reverts commit 744f1f2e70c4d930e5f5
2019-05-22 21:47:32 +02:00
4f20c9de6f
Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"
...
This reverts merge request !27514
2019-05-22 11:45:46 +00:00
04c3c6dd5a
Merge branch 'reorganize-tests-jobs-by-level' into 'master'
...
Reorganize test jobs by level
See merge request gitlab-org/gitlab-ce!27514
2019-05-22 10:21:38 +00:00
2f6a20ce66
Fix typos in the whole gitlab-ce project
2019-05-20 14:11:44 +00:00
4d9c76e9e4
Reorganize test jobs by level
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-20 14:31:58 +02:00
66b4c6564a
Clean up assets that are older than 4 days to reduce assets cache size
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-14 21:34:06 +02:00
334cfe472a
Update FE test script
...
- Don't fail when no tests match
- Print the cmd prefix for each line in it's data
- Update exit code handling
- Add colors to summary message
2019-05-13 09:48:35 -05:00
88b02af305
Create a unified script to run Jest & Karma tests
...
- Created scripts/frontend/test.js
- Updated test task to call Node script
2019-05-13 09:48:34 -05:00
fd5749b2c9
Docs: Merge EE doc/gitlab-geo to CE
2019-05-05 16:27:37 +00:00
b05936cbfa
Docs: Merge Various EE /doc dirs to CE
2019-05-05 15:59:22 +00:00
8b710c8ba4
Docs: Merge EE doc/analytics to CE
2019-05-01 07:13:12 +00:00
84103e2d2f
Disable HTTP for the nginx-ingress Review App service
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-30 09:49:10 +02:00
9649c2ef47
Organize better Review Apps and QA jobs
...
Also, play manual jobs once dependency jobs are done instead of polling
for the dependent jobs to be finished.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-24 19:25:37 +02:00
d0efb430ce
Make the Review App cleanup more efficient
...
Ensure that the cleanup starts right away.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-19 10:50:43 +02:00
955136b56d
Don't fail the job if the Review App doesn't deploy properly
...
It seems the deploy function causes the job to fail if it doesn't
succeed. That wasn't the intent as we want to curl the Review App after
the deploy finished (even if it failed) because sometimes the Review App
is just a bit long to be ready.
This change wraps the Review App deployment with "set +e"/"set -e" to
ensure that the job doesn't fail right away if the deploy fails.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-17 10:49:02 +02:00
64960ae762
Conform scripts/review_apps/review-apps.sh to shellcheck
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-09 15:57:04 +02:00
6dadd965dc
Poll Review App after it's deployed to ensure it's accessible
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-09 15:56:53 +02:00
700e8d1917
Merge branch 'enable-rubocop-application-record' into 'master'
...
Document ApplicationRecord / pluck_primary_key
Closes #59690
See merge request gitlab-org/gitlab-ce!26764
2019-04-01 15:55:46 +00:00
98a5976b78
Document ApplicationRecord / pluck_primary_key
...
We also enable the rubocop that makes it mandatory
2019-03-29 20:54:06 +00:00
42102cd13a
Add more logging in the Review Apps deployment steps
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-28 11:56:38 +01:00
5b05d2b987
First iteration of GitLab own Stylelints
...
DRYed the code
Changed new rules to warnings
Manual prettified and added stylelint rules
2019-03-26 08:13:21 +00:00
dc2a482ba1
Fix the .review-deploy-base job so that env variables are passed
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-19 08:31:20 +01:00
313022c79a
Use gitlab-ce as default project name in asset image building
...
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-03-15 19:15:54 +05:30
de2106998a
Set asset image name properly for all possible CE/EE project names
...
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-03-15 17:00:57 +05:30
9f05e97aad
Run rubocop -a
2019-03-13 13:42:43 +00:00
24426f37d7
Tag asset docker image with GitLab version also
...
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-03-12 16:41:50 +05:30
f11030173b
Batch insert CI rspec_profiling data
...
Instead of inserting a row after each example to an external database,
we save the CI profiling reports into the `rspec_profiling` directory
and insert the data in the update-tests-metadata CI stage. This should
make each spec run faster and also reduce the number of PostgreSQL
connections needed by concurrent CI builds.
`scripts/insert-rspec-profiling-data` also inserts one file at a time
via the PostgreSQL COPY command for faster inserts. The one side effect
is that the `created_at` and `updated_at` timestamps aren't available
since they aren't generated in the CSV.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
2019-03-12 09:51:37 +00:00
c46b791911
Remove node 6 trailing comma support
...
This removes trailing commas from node scripts which previously
omitted them for compatiblity with node 6
2019-03-11 14:16:41 -05:00
fb6a4e21d4
Bring back Rugged implementation of find_commit
...
This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20339 .
For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_find_commit` to activate Rugged paths.
There are also Rake tasks `gitlab:features:enable_rugged` and
`gitlab:features:disable_rugged` to enable/disable these feature
flags altogether.
Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317 .
2019-03-01 08:45:51 -08:00
6c4ca56b83
Move ChatOps docs from EE to core
...
ChatOps used to be in the Ultimate tier.
2019-02-21 03:34:42 +00:00
a992c908b0
Adds the commit sha to the pushed assets
...
* This will upload the sha of the docker image containing assets to
assist with building specific sha builds in the future.
* Addresses: https://gitlab.com/gitlab-org/release/framework/issues/51
2019-02-19 13:51:36 +00:00
00cb8de1ec
Revert "Adds the commit sha to the pushed assets"
...
This reverts commit 481938de84
2019-02-18 08:57:57 -05:00
481938de84
Adds the commit sha to the pushed assets
...
* This will upload the sha of the docker image containing assets to
assist with building specific sha builds in the future.
* Addresses: gitlab-org/release/framework#51
2019-02-18 08:55:49 -05:00
83b1c44a77
add changelogs/README.md
...
this is to quickstart contributors who don't work daily on the codebase
2019-02-18 04:57:57 +00:00
0b53566111
Added Stylelint Setup
...
Added stylelint to static-analysis
Updated yarn dependencies
CSS Fixes and rule adoptions of stylelint
Added stylelint-scss
Deduplicated yarn.lock to clear dependencies
2019-02-14 14:40:50 +01:00
65e9d33ec5
Fix security harness script
...
"[[" Syntax is not supported on debian based systems.
2019-02-08 15:28:44 -02:00
6b39f55d3f
Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-05 14:04:54 +01:00
18dae64c49
Only use 2 replicas for nginx-ingress.controller
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-01 14:36:24 +01:00
e86f0cc212
Don't install Prometheus in Review Apps
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-01 14:33:27 +01:00
3440aa7fa9
Fine-tune Review Apps pod resource requests
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-01 14:33:27 +01:00
79eec04799
Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelines
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-30 09:42:48 +01:00
64a738c0a1
Introduce echoinfo for information
2019-01-24 22:00:52 +08:00
f8a10191f0
Use $CI_COMMIT_REF_NAME for tags in trigger-build
...
Also, pass GITLAB_VERSION and GITLAB_ASSETS_TAG to CNG triggered
pipelines.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 08:43:11 +01:00
67dfd8786b
Use $CI_COMMIT_REF_SLUG in review-apps.sh
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 08:42:45 +01:00
a4f7324170
[Review Apps] Don't exit when dependable job fails
...
The function that retrieves the dependable job is pretty basic and
retrieves the first job found with the matching name, but this job can
be failed but then successfully retried. In that case, we would exit the
depending job even though the dependable job actually succeeded (the
second time). Let's simplify things, be optimistic and continue with the
depending job even if the dependable job fails.
That reverts to the original behavior.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-17 18:56:41 +01:00
2064565abc
Merge branch '55323-review-apps-use-2-replicas-for-the-tiller-deploy-deployment' into 'master'
...
[Review Apps] Use 2 replicas for the `tiller-deploy` Deployment
Closes #55323
See merge request gitlab-org/gitlab-ce!23806
2019-01-10 12:36:06 +00:00
25d98e9d81
Merge branch 'exit-error-if-job-waited-fails' into 'master'
...
Exit `wait_for_job_to_be_done` as error if the job fails
See merge request gitlab-org/gitlab-ce!23997
2019-01-07 10:36:53 +00:00
1854f142e2
Stop using deprecated argument to `gem`
...
`--no-rdoc` and `--no-ri` have been deprecated since RubyGems 2.0:
https://github.com/rubygems/rubygems/blob/v2.0.0/History.txt#L43
They were finally removed in a recent release:
https://github.com/rubygems/rubygems/pull/2354
2018-12-31 09:30:23 +00:00
38a10e3870
Exit as error if job fails
...
If a script is waiting for a job to be done and that job fails,
exit with an error status so that the script doesn't continue
with a prerequisite in an invalid state.
2018-12-21 18:30:52 +00:00
ebf73a19ce
Use 2 replicas for the Deployment
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-19 11:23:43 +01:00
a76ce8b46b
Specify the 'sync' policy for the external-dns deployments
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-18 17:49:53 +01:00
0f751f6f17
Run gitlab:assets:compile on qa jobs
...
Optionally compiling assets when needed for qa jobs proved
unworkable so instead we fall back on compiling them for
all qa jobs.
2018-12-17 15:30:52 -05:00
35c69ea218
Merge branch 'rs-prepare-build-parity' into 'master'
...
CE-EE parity for prepare_build script
See merge request gitlab-org/gitlab-ce!23819
2018-12-17 10:02:15 +00:00
44fef4fe4c
Remove rails 4 support in CI, Gemfiles, bin/ and config/
2018-12-14 19:36:22 +01:00
a183aa3c47
CE-EE parity for prepare_build script
...
This removes EE-only directives in favor of file existence checks.
2018-12-13 14:32:42 -06:00
48ae572847
Remove CREATE_DB_USER variable in prepare_build
...
The last usage of this variable was removed in
0ab6469187
2018-12-13 12:20:40 -06:00
73dce6c870
[QA] Better retrieve job ID for a retried job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-06 10:06:15 +01:00
008c99bf02
Removed the merge-train script
...
We're moving the automatic merging logic to a separate repository, so
there's no need in keeping this file around.
[ci skip]
2018-12-05 13:42:32 +01:00
ee6fb2b1ee
Automatically merge CE master into EE master
...
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.
2018-12-04 14:40:04 +01:00
93420f50b1
Pass GITLAB_REF_SLUG to CNG triggered pipelines
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-29 10:49:30 +01:00
e8db29d086
Merge branch '49570-add-review_qa-job' into 'master'
...
Add an automatic job to run QA smoke tests against Review Apps
Closes #49570
See merge request gitlab-org/gitlab-ce!22853
2018-11-28 10:39:56 +00:00
17756db81d
Override CI_COMMIT_REF_SLUG for QA branches
...
The `gitlab:assets:compile` job isn't run for the QA branches, thus
there's no Docker image correspinding these branches in the registry.
By overriding `CI_COMMIT_REF_SLUG` to `master` for QA branches, the
`fetch-assets` job in the `omnibus-gitlab` pipeline will pull the
`master` assets Docker image.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-26 15:08:01 +01:00
f4b8ecbf9f
Add a manual job to run QA against a Review App
...
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>
2018-11-26 14:49:03 +01:00
7002752d47
Merge branch 'fix-typos-occured' into 'master'
...
Fix typos occured to occurred
See merge request gitlab-org/gitlab-ce!23105
2018-11-22 14:02:52 +00:00
b57c1fa71c
Pass GITLAB_REF_SLUG to the Omnibus triggers
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-22 09:32:36 +01:00
692f87215d
Merge remote-tracking branch 'origin/master' into fix-typos-occured
...
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
2018-11-21 11:58:52 +09:00
553eaf01f7
Add BUILD_ASSETS_IMAGE CI variable
...
* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job
2018-11-15 09:45:04 -06:00
b689b20f20
Fix typos occured to occurred
2018-11-16 00:34:24 +09:00
62bd2aca04
Switch rails 4 to 5 in gitlab-ci
...
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.
2018-11-14 12:38:30 +01:00
4383c7947e
Ensure we abort the cleanup if release is empty
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-13 18:01:46 +01:00
2b7ad9da09
Disable usage pings in review apps
2018-11-11 17:15:03 +05:30
f7f42cf345
Ensure we create the secrets at the right time
...
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>
2018-11-09 12:30:51 +01:00
6a189c1fcd
Allow to override the gitlab-qa ref for the downstream trigger
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-06 16:17:01 +01:00
ce4aae2379
Use CI_COMMIT_REF_SLUG when building assets image
...
* Using CI_COMMIT_REF_NAME fails when the branch or tag contains special
characters
2018-11-01 14:26:51 -05:00
7f47e13218
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
...
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
2018-11-01 10:34:23 +00:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
59d4a6d81c
Merge branch 'prettify-all-remaining-things' into 'master'
...
Prettify remaining files with differences in CE and EE
See merge request gitlab-org/gitlab-ce!22702
2018-10-31 22:42:22 +00:00
31f26a9382
Add prettier to static-analysis job
2018-10-31 14:34:42 -05:00
70ee4e1b3e
Build a docker container storing only the frontent assets
...
* 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
2018-10-31 11:21:14 -05:00
41994c2adf
Add omitted indentation fix
2018-10-23 10:05:57 -05:00
58690a63fa
Add review app to gitlab-ce
...
* Uses the same supporting code as used in EE
* Includes automated cleanup
* Install external-dns helm chart to review apps cluster if it isn't
already
* Adds variables REVIEW_APPS_AWS_SECRET_KEY and
REVIEW_APPS_AWS_ACCESS_key
* review-apps-ce uses a different cipher
2018-10-23 10:05:57 -05:00
a32511692f
Fix/update prettier script
2018-10-22 17:47:03 +00:00
25d8c8d1f0
Improve automated Review Apps cleanup
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-10-22 09:57:50 +02:00
4d7c6a61d7
Improve the variables passed in trigger-build
...
Make the variable names consistent by following the
`TOP_UPSTREAM_SOURCE_*` pattern.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-10-10 12:10:04 +02:00
02b456dbe8
Pass 'TOP_UPSTREAM_SOURCE_SHA' in trigger-build
...
This is needed because `GITLAB_VERSION` has a special meaning in
`omnibus-gitlab` triggers: this is the GitLab version to build.
The problem is that `omnibus-gitlab` also has triggers to run QA for an
`omnibus-gitlab` commit, and if we use `GITLAB_VERSION` in that case,
the comment would be posted on the GitLab CE/EE commit (stored in
`GITLAB_VERSION`), whci hwouldn't make any sense.
Thus we need `TOP_UPSTREAM_SOURCE_SHA` to represent the commit on
which we want to leave a comment.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-10-10 12:10:04 +02:00
1922ca0e67
Improve downstream pipeine trigger class
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-10-08 14:23:58 +02:00
a99bf447a2
Remove Gitlab::Git::Repository#rugged and Gollum code
...
Cleanup code, and refactor tests that still use Rugged. After this, there should
be no Rugged code that access the instance's repositories on non-test
environments. There is still some rugged code for other tasks like the
repository import task, but since it doesn't access any repository storage path
it can stay.
2018-10-02 16:34:28 -03:00
159b650d74
Cleanup review apps more rapidly
...
- Stop review app's environment after 2 days
- Delete review app's environment after 3 days
- Delete Helm release after 4 days
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-10-01 14:08:40 +02:00
3299680cdd
[CE] Port review apps file to CE
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-09-25 16:41:27 +02:00
45d8c213fd
Refactor scripts/trigger-build and post a commit note with the downstream pipeline URL for omnibus triggers
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-09-24 18:24:13 +02:00
8cb39fa8da
Merge branch 'docs-port-ee-community-contributions' into 'master'
...
Docs port ee community contributions
See merge request gitlab-org/gitlab-ce!21311
2018-09-03 10:18:42 +00:00
8f51727d95
Backport schema_changed.sh from EE which prints the diff if the schema is different
2018-08-30 08:29:08 +02:00
2c06a13854
Update scripts/lint-doc.sh
...
Originally submitted at
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3056 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-08-29 17:35:41 +02:00
8a3d565c8e
Don't use arguments keyword in gettext script
...
Causing SAST build to fail unnecessarily.
Follow-up to !19378 .
2018-08-19 01:05:50 -07:00
8f9442fcdf
Frontend: Proper gettext extraction with gettext-extractor
2018-08-16 19:03:57 +00:00
8ea9c81593
Use rugged to validate ref name
2018-07-19 12:23:46 +02:00
d42cd343ca
Removed return statements from prettier script
2018-07-09 09:53:23 +00:00
72fa064000
Simplify downstream branch name
2018-07-05 11:02:38 +02:00
70bf08073d
Resolve "100% CPU for webpack-dev-server running in GDK"
2018-06-25 19:30:37 +00:00
82012d4608
Always run review app for docs-only branches
2018-06-25 15:21:15 +02:00
67f310e41f
Ignore GitLab API hiccups in scripts/trigger-build
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-06-20 17:17:29 +02:00
e04dfff858
Fixed the searching on the whole disk :-P
2018-06-15 12:43:04 +02:00
930baeb92a
Added possibility to run prettier against one specific directory to make our conversion easier
2018-06-15 12:43:03 +02:00
5f3a219e14
Fixed Prettier Config Applying + Updated Prettier to newest version
2018-06-15 12:43:03 +02:00
dd72134eba
Move the trigger-build script into one location to serve both omnibus and cloud-native triggers.
2018-06-14 16:31:32 +02:00
e23fb005cf
Add CI job to check Gemfile.rails5.lock
2018-06-12 11:23:58 +00:00
7083b355a6
Follow Rubocop for scripts/prune-old-flaky-specs
2018-06-01 14:30:10 +08:00
39b6f31c66
Eliminate constants warnings by:
...
* Replace `require` or `require_relative` with `require_dependency`
* Remove unneeded `autoload`
2018-06-01 13:46:46 +08:00
0c977d1725
Merge branch 'dz-no-ee-check' into 'master'
...
Add check for top-level ee directory in CE repo
Closes #46239
See merge request gitlab-org/gitlab-ce!19062
2018-05-22 16:26:30 +00:00
fba580e37f
Update no-ee-check with rubocop recommendation.
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-05-22 18:35:51 +03:00
470f55351b
Add check for top-level ee directory in CE repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-05-21 14:52:45 +03:00
3834040aa8
Merge branch 'rc/improve-single-script-jobs-ci-config' into 'master'
...
Improve the single-script jobs CI config
See merge request gitlab-org/gitlab-ce!19040
2018-05-21 11:03:17 +00:00
bc57a62a5c
Improve the single-script jobs CI config
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-21 11:30:44 +02:00
0bc78d0800
Build cloud native images on tags
...
When on a tag, trigger a multi-project pipeline in the CNG repostiory.
Opting for a trigger rather than an addition to our release-tools
project for a few reasons:
- The Dockerfiles in the CNG image repo change infrequently, and as a result
I don't feel the need/overhead for stable branches in that repo at this time
- My intent with the CNG repo, is that once stable, the Dockerfiles
would actualy move to their component projects, to be versioned with the
code they are building
- It is likely that we will want to followup with a manually triggered package
for branches for devs, and possibly review apps, so it made sense to
build the CNG ci jobs to accept this sort of pipeline.
2018-05-17 15:17:53 -07:00
0ab6469187
Grant privileges after database is created
...
Never drop the database when granting privileges
2018-05-16 21:52:08 +08:00
cdcde75bb7
Only setup db in the first checkout!
2018-05-16 21:52:08 +08:00
d291f69fd9
Fix gitaly-ruby bundle poisoning in CI
2018-05-14 08:10:29 +00:00
d8a58f62bf
Fix scripts/prune-old-flaky-specs requires Bundler to run
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-11 23:07:05 +02:00
bcb7a99575
Use RspecFlaky::Report in scripts/prune-old-flaky-specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-10 15:38:41 +02:00
9bb97abf04
Introduce scripts/prune-old-flaky-specs to prune outdated flaky specs from the report
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-10 15:38:40 +02:00
81aba67e54
Use standard codequality job
2018-04-04 10:01:52 +00:00
f50d0e4eee
Correctly check whether package-and-qa runs for EE
2018-04-03 09:59:47 +02:00
c8205203a1
Add test for new README.md in docs
...
Prefer index.md instead since they provide clean URLs in the docs site
2018-03-26 15:11:38 +02:00
d023244aa5
Make use of the prettier ignore file during our save script
2018-03-26 07:39:14 +00:00
569b06cf20
update eslintignore for node scripts
2018-03-23 11:53:12 -05:00
9238c5d5ca
prettify all node scripts
2018-03-23 11:52:54 -05:00
51e454f3b1
Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation
2018-03-14 19:32:36 +00:00
471728f8fb
Wait for the pipeline to start before canceling it
2018-03-08 14:22:59 +01:00
fe7d45f26a
Fix race condition when previewing docs
...
Cancel the pipeline that gets created the first time the remote
branch is created in order not to overwrite the one we trigger
afterwards.
Closes https://gitlab.com/gitlab-com/gitlab-docs/issues/154
2018-03-06 10:02:21 +01:00
a04ff31e40
Set security harness hook to executable after creation
2018-02-28 09:47:34 -06:00
a0ef01c872
Optimize and improve the inline documentation for the codequality job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-21 16:25:28 +01:00
5ccd3bec95
Merge branch 'improve-codequality-job' into 'master'
...
Simplify the codequality job
See merge request gitlab-org/gitlab-ee!4602
2018-02-21 15:21:05 +01:00
2f0d2ab55b
Run lint:all tasks in forks
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-14 17:34:34 +01:00
e4990b66df
Combine all rake tasks in the static-analysis job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-14 15:18:59 +01:00
ebdebae4ea
Add a security harness script
...
This script toggles a Git pre-push hook that will prevent pushing to
remotes other than dev when the harness is enabled.
2018-02-13 13:09:57 -06:00
4aedec1192
Ban Rugged from Repository
2018-02-01 15:44:36 +01:00
5c2fe2d3d7
Decouple more of Repository from Rugged
2018-01-30 16:21:55 +00:00
33ed96229b
Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-30 11:08:32 +01:00
a2618310ae
Use Process::Status rather than an integer
...
However keep backward compatibility
2018-01-26 19:42:48 +08:00
df2c47b9ff
Don't print stdout in case we're just printing warnings
...
Otherwise it could be confusing
2018-01-26 19:42:48 +08:00
54ca8d0d6c
Fail static-analysis if there's output to stderr
...
TODO: fix offenders
2018-01-26 19:42:48 +08:00
6d6f7536bd
Look for rugged with static analysis
2018-01-25 14:05:11 +01:00
fca2a75266
Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-23 15:29:20 +01:00
d7eb369218
Merge branch 'revert-c8ddf067' into 'master'
...
Revert "Merge branch 'pre-commit-prettier' into 'master'"
See merge request gitlab-org/gitlab-ce!16217
2018-01-17 13:31:16 +00:00
GitLab Bot
Stan Hu
Kyle Wiebers
Rémy Coutable
Takuya Noguchi
Winnie Hellmann
Balasankar "Balu" C
Yorick Peterse
Douglas Barbosa Alexandre
Nick Thomas
Heinrich Lee Yu
Sean McGivern
Lin Jen-Shin
Peter Dave Hello
Desiree Chevalier
Peter Leitzen
Grzegorz Bizon
Jason Plum
Marcia Ramos
Aleksei Lipniagov
Achilleas Pipinellis
Mike Lewis
Qingyu Zhao
Paul Gascou-Vaillancourt
Bob Van Landuyt
Zeger-Jan van de Weg
Kamil Trzciński
Clement Ho
Yoginth
Paul Slaughter
Paul Gascou-Vaillancourt
Marcel Amirault
Tim Zallmann
Mike Greiling
James Fargher
John T Skarbek
John T Skarbek
Elan Ruusamäe
Felipe Artur
Mark Lapierre
Jasper Maes
Robert Speicher
Kushal Pandya
Hiroyuki Sato
Ian Baum
Jan Provaznik
George Tsiolis
Filipa Lacerda
Alejandro Rodríguez
John Eismeier
gfyoung
🌴🇿🇦 Lukas Eipert (OOO until Summit)
Ahmad Hassan
Marin Jankovski
blackst0ne
Dmitriy Zaporozhets
DJ Mountney
Jacob Vosmaer (out of office May 10-14)
Olivier Gonzalez
Grzegorz Bizon
Lukas Eipert