Update config for 8.x branch (#2489)

* prepare for release 9; prepare for branch 8.x * update buildkite pipeline to produce dra on 8.x branch * Update .buildkite/pipeline.yml Co-authored-by: Kuba Soboń <[email protected]> * change regex --------- Co-authored-by: Kuba Soboń <[email protected]>
elastic · Sep 10, 2024 · e0832d6 · e0832d6
1 parent 8f780cd
commit e0832d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -6,15 +6,15 @@ agents:
 
 steps:
   - label: ":package: Package Cloudbeat - Snapshot"
-    if: build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9]+\$/ || build.env("RUN_RELEASE") == "true"
+    if: build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.env("RUN_RELEASE") == "true"
     env:
       WORKFLOW: "snapshot"
     key: "package-snapshot"
     command: "./.buildkite/scripts/package.sh"
     artifact_paths: "build/distributions/*"
 
   - label: ":rocket: Publishing Snapshot DRA artifacts"
-    if: build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9]+\$/ || build.env("RUN_RELEASE") == "true"
+    if: build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.env("RUN_RELEASE") == "true"
     depends_on: "package-snapshot"
     command: "./.buildkite/scripts/publish.sh"
     env:

diff --git a/.mergify.yml b/.mergify.yml
@@ -131,10 +131,10 @@ pull_request_rules:
           To fixup this pull request, you need to add the backport labels for the needed
           branches, such as:
           * `backport-v./d./d./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit
-          **NOTE**: `backport-skip` has been added to this pull request.
+          **NOTE**: `backport-v8.x` has been added to help with the transition to the new branch 8.x.
       label:
         add:
-          - backport-skip
+          - backport-v8.x
   - name: remove-backport label
     conditions:
       - label~=backport-v
@@ -313,3 +313,16 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
+  - name: backport patches to 8.x branch
+    conditions:
+      - merged
+      - label=backport-v8.x
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.x"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"