Commit Graph

235 Commits

Author SHA1 Message Date
John T Skarbek 00cb8de1ec
Revert "Adds the commit sha to the pushed assets"
This reverts commit 481938de84.
2019-02-18 08:57:57 -05:00
John T Skarbek 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
Elan Ruusamäe 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
Tim Zallmann 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
Felipe Artur 65e9d33ec5 Fix security harness script
"[[" Syntax is not supported on debian based systems.
2019-02-08 15:28:44 -02:00
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Lin Jen-Shin 64a738c0a1 Introduce echoinfo for information 2019-01-24 22:00:52 +08:00
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Rémy Coutable 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
Sean McGivern 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
Mark Lapierre 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
Rémy Coutable ebf73a19ce
Use 2 replicas for the Deployment
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-19 11:23:43 +01:00
Rémy Coutable 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
Mark Lapierre 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
Rémy Coutable 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
Jasper Maes 44fef4fe4c Remove rails 4 support in CI, Gemfiles, bin/ and config/ 2018-12-14 19:36:22 +01:00
Robert Speicher 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
Robert Speicher 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
Rémy Coutable 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
Yorick Peterse 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
Yorick Peterse 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
Rémy Coutable 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
Sean McGivern 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
Rémy Coutable 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
Rémy Coutable 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
Kushal Pandya 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
Rémy Coutable 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
Hiroyuki Sato 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
Ian Baum 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
Hiroyuki Sato b689b20f20 Fix typos occured to occurred 2018-11-16 00:34:24 +09:00
Jan Provaznik 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
Rémy Coutable 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
Balasankar "Balu" C 2b7ad9da09
Disable usage pings in review apps 2018-11-11 17:15:03 +05:30
Rémy Coutable 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
Rémy Coutable 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
Ian Baum 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
Achilleas Pipinellis 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
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Filipa Lacerda 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
Mike Greiling 31f26a9382
Add prettier to static-analysis job 2018-10-31 14:34:42 -05:00
Ian Baum 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
Ian Baum 41994c2adf Add omitted indentation fix 2018-10-23 10:05:57 -05:00
Ian Baum 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