From 3c419624ba56c962b5c66528b18b803fa3f0877b Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Mon, 30 Jun 2025 08:53:13 +0100
Subject: [PATCH] [CI] Updates Buildkite pipeline and GH Actions for 9.1

---
 .buildkite/pipeline.yml                 | 58 +------------------------
 .github/workflows/{main.yml => 9.1.yml} |  6 +--
 2 files changed, 4 insertions(+), 60 deletions(-)
 rename .github/workflows/{main.yml => 9.1.yml} (96%)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 117dc6fd41..f9524b2f65 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,69 +26,13 @@ steps:
     env:
       RUBY_VERSION: '{{ matrix.ruby }}'
       STACK_VERSION: 9.1.0-SNAPSHOT
-      ES_YAML_TESTS_BRANCH: main
+      ES_YAML_TESTS_BRANCH: 9.1
       TRANSPORT_VERSION: '{{ matrix.transport }}'
       RUBY_SOURCE: '{{ matrix.ruby_source }}'
       TEST_SUITE: platinum
       DEBUG: true
     command: ./.buildkite/run-yaml-tests.sh
     artifact_paths: elasticsearch-api/tmp/*
-  - group: 'Elasticsearch Serverless :elasticsearch:'
-    steps:
-      - label: 'Create :elasticsearch: Serverless projects'
-        key: create-serverless
-        agents:
-          image: 'docker.elastic.co/appex-qa/qaf:latest'
-        env:
-          EC_PROJECT_PREFIX: ruby
-          EC_REGISTER_BACKEND: buildkite
-          EC_REGION: aws-eu-west-1
-          EC_ENV: qa
-        commands:
-          - mkdir ~/.elastic
-          - touch ~/.elastic/cloud.json
-          - >-
-            echo "{\"api_key\":{\"qa\":\"$(vault read -field=qa
-            secret/ci/elastic-elasticsearch-ruby/cloud-access)\"}}" >
-            ~/.elastic/cloud.json
-          - ./.buildkite/create-serverless.sh
-      - label: 'Run :elasticsearch: Serverless :rspec: Tests :ruby:'
-        key: run-serverless-tests
-        depends_on:
-          - step: create-serverless
-        soft_fail:
-          - exit_status: "*"
-        agents:
-          provider: gcp
-        env:
-          RUBY_VERSION: '3.4'
-          RUBY_SOURCE: ruby
-          TEST_SUITE: serverless
-          ES_YAML_TESTS_BRANCH: main
-          QUIET: false
-        command: ./.buildkite/run-yaml-tests.sh
-        artifact_paths: elasticsearch-api/tmp/*
-      - label: 'Destroy :elasticsearch: Serverless projects'
-        depends_on:
-          - step: run-serverless-tests
-            allow_failure: true
-        agents:
-          image: 'docker.elastic.co/appex-qa/qaf:latest'
-        env:
-          EC_REGISTER_BACKEND: buildkite
-          EC_ENV: qa
-          EC_REGION: aws-eu-west-1
-        commands:
-          - mkdir ~/.elastic
-          - touch ~/.elastic/cloud.json
-          - >-
-            export EC_PROJECT_NAME=`buildkite-agent meta-data get
-            "EC_PROJECT_NAME"`
-          - >-
-            echo "{\"api_key\":{\"qa\":\"$(vault read -field=qa
-            secret/ci/elastic-elasticsearch-ruby/cloud-access)\"}}" >
-            ~/.elastic/cloud.json
-          - qaf elastic-cloud projects delete
   - wait: ~
     continue_on_failure: true
   - label: Log Results
diff --git a/.github/workflows/main.yml b/.github/workflows/9.1.yml
similarity index 96%
rename from .github/workflows/main.yml
rename to .github/workflows/9.1.yml
index 88b12cff87..4203f29587 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/9.1.yml
@@ -1,11 +1,11 @@
-name: main
+name: 9.1
 on:
   push:
     branches:
-      - main
+      - 9.1
   pull_request:
     branches:
-      - main
+      - 9.1
 jobs:
   test-main:
     env: