Update pipeline.yml

Fix conflicts

.buildkite/pipeline.yml

@@ -4,21 +4,12 @@ env:
   SETUP_GVM_VERSION: "v0.5.0"
   DOCKER_COMPOSE_VERSION: "1.25.5"
   DOCKER_REGISTRY: "docker.elastic.co"
-<<<<<<< HEAD
-  DOCKER_IMAGE: "${DOCKER_REGISTRY}/observability-ci/temp-fleet-server" # needs to rename after tests
-  DOCKER_IMAGE_SHA_TAG: "temp-${BUILDKITE_COMMIT}" # needs to rename after tests
-  DOCKER_IMAGE_LATEST_TAG: "temp-latest" # needs to rename after tests
-  DOCKER_IMAGE_GIT_TAG: "temp-${BUILDKITE_BRANCH}" # needs to rename after tests
-  GO_AGENT_IMAGE: "golang:1.20.5"
-  TERRAFORM_VERSION: '1.4.6'
-=======
   DOCKER_IMAGE: "${DOCKER_REGISTRY}/observability-ci/fleet-server" # needs to rename for rollback
   DOCKER_IMAGE_SHA_TAG: "git-${BUILDKITE_COMMIT:0:12}" # needs to rename for rollback, should be "git-${BUILDKITE_COMMIT:0:12}"
   DOCKER_IMAGE_LATEST_TAG: "latest" # needs to rename for rollback
   DOCKER_IMAGE_GIT_TAG: "${BUILDKITE_BRANCH}" # needs to rename for rollback
   GO_AGENT_IMAGE: "golang:${GO_VERSION}"
   TERRAFORM_VERSION: "1.4.6"
->>>>>>> 5cce568 ([Fleet] Fix docker publish step in buildkite (#2815))
 
 steps:
   - group: "Check and build"
@@ -114,13 +105,9 @@ steps:
       env:
         SERVICE_COMMIT_HASH: ${BUILDKITE_COMMIT:0:12}
         REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/fleet/config.yaml
-<<<<<<< HEAD
-
-=======
     depends_on:
       - step: "publish"
 
->>>>>>> 5cce568 ([Fleet] Fix docker publish step in buildkite (#2815))
   - label: ":gcloud: Release test"
     key: "release-test"
     command: ".buildkite/scripts/release_test.sh"
@@ -148,4 +135,4 @@ steps:
     if: "build.env('BUILDKITE_BRANCH') != '' && build.env('BUILDKITE_TAG') == '' && build.env('BUILDKITE_PULL_REQUEST') == ''"
     depends_on:
       - step: "release-package-registry"
-        allow_failure: false
+        allow_failure: false