Skip to content

WIP: EE compat check with targets besides master

Robert Speicher requested to merge rs-dev-compat-check into master

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/56760

Atomic commits for review

6c56df2a - Set ee_compat_check to merge_requests

This allows the CI_MERGE_REQUEST_TARGET_BRANCH_NAME variable to populate.

261b9d4f - Remove job_id from ee_compat_check

We can use the CI_JOB_URL env instead.

444d7d1f - Rename clone_repo to clone_ee_repo

It's only ever used to clone the EE repo from ensure_ee_repo, so this name is a bit clearer.

b506200b - EE compat check in branches other than master

When our merge request targets something other than master, we attempt to target the same branch (adding the -ee suffix) in the EE remote.

Where methods previously took branch, branch_remote, and target_remote arguments (and thus forced us to infer the target branch name from the remote name), we now take a remote/branch pair as source and target arguments. This allows us to pass the target branch at the invocation rather than inferring it.

f9c6d29d - Rename find_merge_base_with_master

It's not always "with master" anymore.

Edited by Robert Speicher

Merge request reports