Remove the "autorebase-merge-request" CI job

The "autorebase-merge-request" CI job is not useful in practice as the
Danger check whose complaints it was supposed to address does not look
for commit hashes in the original merge request's target branch, but
rather in the original merge request itself - and those commit hashes
remain stable over time.  Furthermore, after a backport gets merged, any
cherry-pick references its commits might contain will be maintained by
other autorebasing jobs.  Given the above, remove the
"autorebase-merge-request" CI job as it serves no useful purpose.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b433532c33f94b04cfe57ed5cd15a0698038d46c..937dc75af339fbc0767b246b78b56450a023d9a4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2665,7 +2665,7 @@ merged-metadata:
     - git range-diff --color=always "${BASE_COMMIT}" "${CI_COMMIT_SHA}" HEAD
     - if ! git push --force-with-lease -o ci.variable="AUTOREBASED=1" origin "HEAD:${CI_COMMIT_REF_NAME}"; then touch .git-push-failed; exit 1; fi
   after_script:
-    - if [ "${CI_JOB_STATUS}" = "success" ] || [ "${CI_PIPELINE_SOURCE}" = "merge_request_event" ]; then exit 0; fi
+    - if [ "${CI_JOB_STATUS}" = "success" ]; then exit 0; fi
     - |
       REASON_DETAILS=""
       if git rebase --abort; then
@@ -2698,19 +2698,6 @@ merged-metadata:
     - >
       "$CI_PROJECT_DIR"/bind9-qa/releng/message_zulip.py --message message.txt --channel bind9-team --topic 'Autorebase errors'
 
-autorebase-merge-request:
-  <<: *autorebase
-  stage: quick-checks
-  resource_group: null
-  before_script:
-    - git fetch --depth="${GIT_DEPTH}" origin "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}"
-    - export BASE_PROJECT="isc-private/bind9"
-    - export BASE_COMMIT="$(git rev-parse "origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}")"
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE == "isc-private" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^security-(bind-9\.[0-9]+)$/'
-      when: manual
-      allow_failure: true
-
 autorebase-trigger-security:
   <<: *autorebase_common
   rules:

diff --git a/dangerfile.py b/dangerfile.py
index 647bc9767dd306d84c1e89a27d432436fd4434b8..5cf06bce08614ea170a2f5ed1fb56b8f31e3547c 100644 (file)
--- a/dangerfile.py
+++ b/dangerfile.py
@@ -400,8 +400,6 @@ if is_backport:
                 if not is_full_backport:
                     message(msg)
                 else:
-                    if target_branch.startswith("security-"):
-                        msg += ":bulb: Try running the `autorebase-merge-request` job. "
                     msg += (
                         "Please use `-x` when cherry-picking to include "
                         "the full original commit ID. Alternatively, use the "