From 8a1b4da64e746dfe39c94ee0a88e118673f6cfdd Mon Sep 17 00:00:00 2001 From: Ramon Butter Date: Tue, 14 Nov 2023 11:03:58 +0100 Subject: [PATCH] qg pipeline fix --- .buildkite/pipeline.fleet-server-tests.yaml | 4 ++-- ...-production-canary.yaml => pipeline.tests-production.yaml} | 3 +++ catalog-info.yaml | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) rename .buildkite/{pipeline.tests-production-canary.yaml => pipeline.tests-production.yaml} (85%) diff --git a/.buildkite/pipeline.fleet-server-tests.yaml b/.buildkite/pipeline.fleet-server-tests.yaml index 832d7f783..b4c49cbd2 100644 --- a/.buildkite/pipeline.fleet-server-tests.yaml +++ b/.buildkite/pipeline.fleet-server-tests.yaml @@ -18,8 +18,8 @@ steps: - label: ":pipeline::grey_question::seedling: Trigger service tests for ${ENVIRONMENT}" command: "make -C /agent run-environment-tests" agents: - image: "docker.elastic.co/ci-agent-images/quality-gate-seedling:0.0.2" + image: "docker.elastic.co/ci-agent-images/quality-gate-seedling:0.0.3" notify: - slack: "${TEAM_CHANNEL}" - if: build.branch == "main" && build.state == "failed" \ No newline at end of file + if: build.branch == "main" && build.state == "failed" diff --git a/.buildkite/pipeline.tests-production-canary.yaml b/.buildkite/pipeline.tests-production.yaml similarity index 85% rename from .buildkite/pipeline.tests-production-canary.yaml rename to .buildkite/pipeline.tests-production.yaml index 691284eb7..169e58276 100644 --- a/.buildkite/pipeline.tests-production-canary.yaml +++ b/.buildkite/pipeline.tests-production.yaml @@ -3,11 +3,14 @@ steps: - label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests" + if: build.env("ENVIRONMENT") == "production-canary" trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests build: env: REGION_ID: aws-us-east-1 NAME_PREFIX: ci_test_fleet-promotion_ message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production-canary.yaml)" + - label: ":cookie: 1h bake period before continuing promotion" + if: build.env("ENVIRONMENT") == "production-canary" command: "sleep 3600" diff --git a/catalog-info.yaml b/catalog-info.yaml index 5b2c93f31..ddf781aea 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -132,6 +132,7 @@ spec: repository: elastic/fleet-server pipeline_file: .buildkite/pipeline.fleet-server-tests.yaml branch_configuration: "main" + skip_intermediate_builds: false provider_settings: build_pull_requests: false trigger_mode: none