Merge branch 'main' into seanstory/bump-main-to-9.1

Author: jedrazb

.backportrc.json

@@ -3,14 +3,15 @@
     { "name": "main", "checked": true },
     "9.0",
     "8.x",
+    "8.18",
     "8.17",
     "8.16"
   ],
   "fork": false,
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v9.1.0$": "main",
-    "^v8.18.0$": "8.x",
+    "^v8.19.0$": "8.x",
     "^v(\\d+).(\\d+)(.\\d+)*$": "$1.$2"
   },
   "upstream": "elastic/connectors"

.buildkite/pipeline.yml

@@ -578,7 +578,7 @@ steps:
   # ----
   - group: ":truck: Packaging and DRA"
     key: "mbp_dra_group"
-    if: "(build.branch == \"main\" || build.branch == \"9.0\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
+    if: "(build.branch == \"main\" || build.branch == \"9.0\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.branch == \"8.18\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
     depends_on:
       - "lint"
       - "unit_tests"

catalog-info.yaml

@@ -62,6 +62,10 @@ spec:
           branch: 8.x
           cronline: '@daily'
           message: "Builds, tests, and pushes daily `8.x` DRA artifacts"
+        Daily 8.18:
+          branch: "8.18"
+          cronline: '@daily'
+          message: "Builds, tests, and pushes daily `8.18` DRA artifacts"
         Daily 8.17:
           branch: "8.17"
           cronline: '@daily'
@@ -110,6 +114,10 @@ spec:
         trigger_mode: "none"
       repository: "elastic/connectors"
       schedules:
+        Daily 8_18:
+          branch: '8.18'
+          cronline: '@daily'
+          message: "Runs daily `8.18` e2e test"
         Daily 8_17:
           branch: '8.17'
           cronline: '@daily'
@@ -164,6 +172,10 @@ spec:
         trigger_mode: "none"
       repository: "elastic/connectors"
       schedules:
+        Daily 8_18:
+          branch: '8.18'
+          cronline: '@daily'
+          message: "Runs daily `8.18` e2e aarch64 test"
         Daily 8_17:
           branch: '8.17'
           cronline: '@daily'