Rebase branches on main

Author: ggeorgiev-gitlab

.gitlab-ci.yml

@@ -8,6 +8,7 @@ stages:
 - release
 - postrelease
 - deploy
+- rebase
 - docs
 
 include:
@@ -32,6 +33,7 @@ include:
 - local: /.gitlab/ci/postrelease.gitlab-ci.yml
 - local: /.gitlab/ci/deploy.gitlab-ci.yml
 - local: /.gitlab/ci/docs.gitlab-ci.yml
+- local: /.gitlab/ci/rebase.gitlab-ci.yml
 - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/[email protected]
   inputs:
     job_stage: qa

.gitlab/ci/_rules.gitlab-ci.yml

@@ -55,6 +55,9 @@
 .if-runner-or-security-runner-stable-ref: &if-runner-or-security-runner-stable-ref
   if: $CI_COMMIT_REF_NAME =~ /\A[0-9]+-[0-9]+-stable\z/ && ($CI_PROJECT_PATH == "gitlab-org/gitlab-runner" || $CI_PROJECT_PATH == "gitlab-org/security/gitlab-runner")
 
+.if-runner-or-security-runner-feature-ref: &if-runner-or-security-runner-feature-ref
+  if: $CI_COMMIT_REF_NAME =~ /feature\/.+/ && ($CI_PROJECT_PATH == "gitlab-org/gitlab-runner" || $CI_PROJECT_PATH == "gitlab-org/security/gitlab-runner")
+
 .if-runner-release-ref: &if-runner-release-ref
   if: $CI_COMMIT_REF_NAME =~ /\Av[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?\z/ && $CI_PROJECT_PATH == "gitlab-org/gitlab-runner"
 
@@ -94,6 +97,7 @@
     - <<: *if-merge-request-pipeline
     - <<: *if-runner-or-security-runner-default-branch
     - <<: *if-runner-or-security-runner-stable-ref
+    - <<: *if-runner-or-security-runner-feature-ref
     - <<: *if-runner-release-ref
     - <<: *if-security-runner-release-ref
 
@@ -105,6 +109,8 @@
       changes: *code-backstage-patterns
     - <<: *if-runner-or-security-runner-stable-ref
       changes: *code-backstage-patterns
+    - <<: *if-runner-or-security-runner-feature-ref
+      changes: *code-backstage-patterns
     - <<: *if-runner-release-ref
       changes: *code-backstage-patterns
     - <<: *if-security-runner-release-ref
@@ -120,6 +126,8 @@
       changes: *code-backstage-patterns
     - <<: *if-runner-or-security-runner-stable-ref
       changes: *code-backstage-patterns
+    - <<: *if-runner-or-security-runner-feature-ref
+      changes: *code-backstage-patterns
     - <<: *if-runner-release-ref
       changes: *code-backstage-patterns
     - <<: *if-security-runner-release-ref
@@ -175,6 +183,10 @@
       changes: *code-backstage-patterns
     - <<: *if-runner-bleeding-edge-release-ref
       changes: *code-backstage-patterns
+    - <<: *if-runner-or-security-runner-stable-ref
+      changes: *code-backstage-patterns
+    - <<: *if-runner-or-security-runner-feature-ref
+      changes: *code-backstage-patterns
 
 .rules:release-or-security:bleeding-edge-or-stable:
   rules:
@@ -184,6 +196,8 @@
       changes: *code-backstage-patterns
     - <<: *if-runner-or-security-runner-stable-ref
       changes: *code-backstage-patterns
+    - <<: *if-runner-or-security-runner-feature-ref
+      changes: *code-backstage-patterns
 
 .rules:release:stable-or-rc:
   rules:

.gitlab/ci/rebase.gitlab-ci.yml

@@ -0,0 +1,34 @@
+# Rebase branches in $REPO_REBASE_BRANCHES, separated by a comma on top of main
+rebase on main:
+  stage: rebase
+  rules:
+    - if: $REPO_REBASE_BRANCHES != "" && $REPO_REBASE_BRANCHES != null && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH == "gitlab-org/gitlab-runner"
+  allow_failure: true
+  script:
+    - |
+      git config --global user.email "[email protected]"
+      git config --global user.name "GitLab Runner CI Rebase"
+
+      git fetch origin $CI_DEFAULT_BRANCH
+      git checkout -B $CI_DEFAULT_BRANCH origin/$CI_DEFAULT_BRANCH
+
+      git remote add push-remote https://oauth2:${REPO_REBASE_PUSH_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git
+
+      IFS=',' read -ra BRANCHES <<< "$REPO_REBASE_BRANCHES"
+      for BRANCH in "${BRANCHES[@]}"; do
+        echo "Processing branch: $BRANCH"
+
+        git fetch origin $BRANCH
+
+        git checkout $BRANCH
+
+        if ! git rebase $CI_DEFAULT_BRANCH; then
+          echo "Rebase failed for branch $BRANCH"
+          exit 1
+        fi
+
+        # --force-with-lease doesn't work on shallow clones
+        git push push-remote $BRANCH --force
+
+        git checkout $CI_DEFAULT_BRANCH
+      done