• Yorick Peterse's avatar
    Automatically merge CE master into EE master · ee6fb2b1
    Yorick Peterse authored
    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.
    ee6fb2b1
Name
Last commit
Last update
..
frontend Loading commit data...
review_apps Loading commit data...
build_assets_image Loading commit data...
create_mysql_user.sh Loading commit data...
create_postgres_user.sh Loading commit data...
detect-new-flaky-examples Loading commit data...
gitaly-test-build Loading commit data...
gitaly-test-spawn Loading commit data...
gitaly_test.rb Loading commit data...
lint-changelog-yaml Loading commit data...
lint-conflicts.sh Loading commit data...
lint-doc.sh Loading commit data...
lint-rugged Loading commit data...
merge-reports Loading commit data...
merge-simplecov Loading commit data...
merge-train Loading commit data...
no-ee-check Loading commit data...
prepare_build.sh Loading commit data...
prune-old-flaky-specs Loading commit data...
rails4-gemfile-lock-check Loading commit data...
schema_changed.sh Loading commit data...
security-harness Loading commit data...
static-analysis Loading commit data...
sync-reports Loading commit data...
trigger-build Loading commit data...
trigger-build-docs Loading commit data...
utils.sh Loading commit data...