[9.1] (backport #8889) Revert [CI] Stable stack version override #8352 and #8528

.mergify.yml

@@ -19,24 +19,22 @@ defaults:
       labels:
         - "backport"
 pull_request_rules:
-  - name: automatic approval for updatecli pull requests with changes in .buildkite or create_deployment_csp_configuration.yaml
+  - name: automatic approval for updatecli pull requests with changes in .buildkite
     conditions:
       - author=github-actions[bot]
       - check-success=buildkite/elastic-agent
       - or:
-        - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
         - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
       - head~=^updatecli_.*
     actions:
       review:
         type: APPROVE
         message: Automatically approving mergify
-  - name: automatic squash and merge with success checks and the files matching the regex .buildkite or create_deployment_csp_configuration.yaml is modified.
+  - name: automatic squash and merge with success checks and the files matching the regex .buildkite is modified.
     conditions:
       - author=github-actions[bot]
       - check-success=buildkite/elastic-agent
       - or:
-        - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
         - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
       - head~=^updatecli_.*
       - "#approved-reviews-by>=1"
@@ -47,7 +45,6 @@ pull_request_rules:
     conditions:
       - author=github-actions[bot]
       - or:
-        - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
         - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
       - head~=^updatecli_.*
       - "#check-failure>0"

pkg/testing/ess/create_deployment_csp_configuration.yaml

@@ -13,8 +13,11 @@ aws:
   elasticsearch_conf_id: "aws.es.datahot.i3"
   elasticsearch_deployment_template_id: "aws-storage-optimized"
   kibana_instance_configuration_id: "aws.kibana.c5d"
+<<<<<<< HEAD
 # Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
 docker:
   integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.0-dd974feb-SNAPSHOT"
   elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.0-dd974feb-SNAPSHOT"
   kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.1.0-dd974feb-SNAPSHOT"
+=======
+>>>>>>> fb8b88381 (Revert [CI] Stable stack version override #8352 and #8528 (#8889))

test_infra/ess/deployment.tf

@@ -61,6 +61,7 @@ locals {
 
   ess_region             = coalesce(var.ess_region, "gcp-us-east1")
   deployment_template_id = coalesce(var.deployment_template_id, "gcp-storage-optimized")
+
   ess_properties = merge(
     {
       docker = {
@@ -72,23 +73,10 @@ locals {
     },
     yamldecode(file("${path.module}/../../pkg/testing/ess/create_deployment_csp_configuration.yaml")))
 
-  integration_server_docker_image = coalesce(
-    var.integration_server_docker_image, 
-    local.ess_properties.docker.integration_server_image,
-    "docker.elastic.co/cloud-release/elastic-agent-cloud:${var.stack_version}"
-  )
-
-  elasticsearch_docker_image = coalesce(
-    var.elasticsearch_docker_image, 
-    local.ess_properties.docker.elasticsearch_image,
-    "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:${var.stack_version}"
-  )
-
-  kibana_docker_image = coalesce(
-    var.kibana_docker_image, 
-    local.ess_properties.docker.kibana_image,
-    "docker.elastic.co/cloud-release/kibana-cloud:${var.stack_version}"
-  )
+
+  integration_server_docker_image = coalesce(var.integration_server_docker_image, local.ess_properties.docker.integration_server_image, "docker.elastic.co/cloud-release/elastic-agent-cloud:${var.stack_version}")
+  elasticsearch_docker_image = coalesce(var.elasticsearch_docker_image, local.ess_properties.docker.elasticsearch_image, "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:${var.stack_version}")
+  kibana_docker_image = coalesce(var.kibana_docker_image, local.ess_properties.docker.kibana_image, "docker.elastic.co/cloud-release/kibana-cloud:${var.stack_version}")
 }
 
 # If we have defined a stack version, validate that this version exists on that region and return it.