| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
| |
We're moving the automatic merging logic to a separate repository, so
there's no need in keeping this file around.
[ci skip]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|\
| |
| |
| |
| |
| |
| | |
Add an automatic job to run QA smoke tests against Review Apps
Closes #49570
See merge request gitlab-org/gitlab-ce!22853
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| | |
Fix typos occured to occurred
See merge request gitlab-org/gitlab-ce!23105
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
|
| | | |
|
| |/
|/|
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|/
|
|
|
|
| |
* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
| |
* Using CI_COMMIT_REF_NAME fails when the branch or tag contains special
characters
|
|\
| |
| |
| |
| | |
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Prettify remaining files with differences in CE and EE
See merge request gitlab-org/gitlab-ce!22702
|
| |/ |
|
|/
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
| |
Make the variable names consistent by following the
`TOP_UPSTREAM_SOURCE_*` pattern.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
| |
pipeline URL for omnibus triggers
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|\
| |
| |
| |
| | |
Docs port ee community contributions
See merge request gitlab-org/gitlab-ce!21311
|
| |
| |
| |
| |
| |
| |
| | |
Originally submitted at
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3056.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|/
|
|
| |
different
|
|
|
|
|
|
| |
Causing SAST build to fail unnecessarily.
Follow-up to !19378.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
| |
conversion easier
|
| |
|
|
|
|
| |
cloud-native triggers.
|
| |
|