Octaavio patch 1

.backportrc.json

@@ -1,17 +1,9 @@
 {
-  "upstream": "elastic/elasticsearch",
-  "targetBranchChoices": [
-    "main",
-    "8.3",
-    "8.2",
-    "8.1",
-    "8.0",
-    "7.17",
-    "6.8"
-  ],
-  "targetPRLabels": ["backport"],
-  "branchLabelMapping": {
-    "^v8.4.0$": "main",
-    "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
+  "upstream" : "elastic/elasticsearch",
+  "targetBranchChoices" : [ "main", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
+  "targetPRLabels" : [ "backport" ],
+  "branchLabelMapping" : {
+    "^v8.4.3$" : "main",
+    "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
-}
+}

.ci/bwcVersions

@@ -55,6 +55,7 @@ BWC_VERSION:
   - "7.17.4"
   - "7.17.5"
   - "7.17.6"
+  - "7.17.7"
   - "8.0.0"
   - "8.0.1"
   - "8.1.0"
@@ -70,3 +71,6 @@ BWC_VERSION:
   - "8.3.2"
   - "8.3.3"
   - "8.4.0"
+  - "8.4.1"
+  - "8.4.2"
+  - "8.4.3"

.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml

@@ -14,7 +14,8 @@
           name: os
           values:
             - "centos-7&&immutable"
-            - "amazon&&immutable"
+            - "amazon-2&&immutable"
+            - "amazon-2022&&immutable"
             - "debian-10&&immutable"
             - "debian-11&&immutable"
             - "opensuse-15-1&&immutable"

.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml

@@ -1,7 +1,6 @@
 ---
 - job:
     name: elastic+elasticsearch+%BRANCH%+periodic+ear
-    workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+ear
     display-name: "elastic / elasticsearch # %BRANCH% - encryption at rest"
     description: "The Elasticsearch %BRANCH% branch encryption at rest compatibility tests.\n\n"
     node: packaging-large

.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml

@@ -22,8 +22,14 @@
           export BEATS_DIR=$(pwd)/distribution/docker/build/artifacts/beats
 
           mkdir -p ${BEATS_DIR}
-          curl -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
-          curl -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
+          curl --fail -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
+          curl --fail -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
 
-          $WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false \
+          # Fetch ML artifacts
+          export ML_IVY_REPO=$(mktemp -d)
+          mkdir -p ${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}
+          curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-deps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-deps.zip
+          curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-nodeps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-nodeps.zip
+
+          $WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
             -Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build