From cf012987b6c1a1d3bebb98d01d3f4d091ed4997a Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Fri, 12 Apr 2024 16:39:59 +0200 Subject: [PATCH 1/2] Update labels in BK steps --- .../pipeline.trigger.integration.tests.sh | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.buildkite/pipeline.trigger.integration.tests.sh b/.buildkite/pipeline.trigger.integration.tests.sh index 5da18fc06d..a662946590 100755 --- a/.buildkite/pipeline.trigger.integration.tests.sh +++ b/.buildkite/pipeline.trigger.integration.tests.sh @@ -39,7 +39,11 @@ CHECK_PACKAGES_TESTS=( ) for independent_agent in false true ; do for test in "${CHECK_PACKAGES_TESTS[@]}"; do - echo " - label: \":go: Integration test: ${test} - independent_agent ${independent_agent}\"" + label_suffix = "" + if [[ "$independent_agent" == "true" ]]; then + label_suffix= " (independent agent)" + fi + echo " - label: \":go: Integration test: ${test}${label_suffix}\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t ${test}" echo " agents:" echo " provider: \"gcp\"" @@ -76,8 +80,12 @@ done pushd test/packages/parallel > /dev/null for independent_agent in false true; do for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do + label_suffix = "" + if [[ "$independent_agent" == "true" ]]; then + label_suffix= " (independent agent)" + fi package_name=$(basename "${package}") - echo " - label: \":go: Integration test: ${package_name} - independent_agent ${independent_agent}\"" + echo " - label: \":go: Integration test: ${package_name}${label_suffix}\"" echo " key: \"integration-parallel-${package_name}-agent-${independent_agent}\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-check-packages-parallel -p ${package_name}" echo " env:" @@ -116,12 +124,16 @@ echo " artifact_paths:" echo " - build/elastic-stack-dump/install-zip-shellinit/logs/*.log" for independent_agent in false true; do -echo " - label: \":go: Integration test: test-system-test-flags - independent_agent ${independent_agent}\"" -echo " command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags" -echo " agents:" -echo " provider: \"gcp\"" -echo " env:" -echo " ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}" + label_suffix = "" + if [[ "$independent_agent" == "true" ]]; then + label_suffix= " (independent agent)" + fi + echo " - label: \":go: Integration test: test-system-test-flags${label_suffix}\"" + echo " command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags" + echo " agents:" + echo " provider: \"gcp\"" + echo " env:" + echo " ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}" done echo " - label: \":go: Integration test: test-profiles-command\"" From c6da4241a40e9e4a13bf80c60702ffb550f68eed Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Fri, 12 Apr 2024 16:50:23 +0200 Subject: [PATCH 2/2] Remove prefixes test --- .../pipeline.trigger.integration.tests.sh | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.buildkite/pipeline.trigger.integration.tests.sh b/.buildkite/pipeline.trigger.integration.tests.sh index a662946590..1e62058968 100755 --- a/.buildkite/pipeline.trigger.integration.tests.sh +++ b/.buildkite/pipeline.trigger.integration.tests.sh @@ -20,7 +20,8 @@ STACK_COMMAND_TESTS=( ) for test in "${STACK_COMMAND_TESTS[@]}"; do - echo " - label: \":go: Integration test: ${test}\"" + test_name=${test#"test-"} + echo " - label: \":go: Integration test: ${test_name}\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t ${test}" echo " agents:" echo " provider: \"gcp\"" @@ -39,11 +40,12 @@ CHECK_PACKAGES_TESTS=( ) for independent_agent in false true ; do for test in "${CHECK_PACKAGES_TESTS[@]}"; do - label_suffix = "" + label_suffix="" if [[ "$independent_agent" == "true" ]]; then - label_suffix= " (independent agent)" + label_suffix=" (independent agent)" fi - echo " - label: \":go: Integration test: ${test}${label_suffix}\"" + test_name=${test#"test-check-packages-"} + echo " - label: \":go: Integration test: ${test_name}${label_suffix}\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t ${test}" echo " agents:" echo " provider: \"gcp\"" @@ -80,9 +82,9 @@ done pushd test/packages/parallel > /dev/null for independent_agent in false true; do for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do - label_suffix = "" + label_suffix="" if [[ "$independent_agent" == "true" ]]; then - label_suffix= " (independent agent)" + label_suffix=" (independent agent)" fi package_name=$(basename "${package}") echo " - label: \":go: Integration test: ${package_name}${label_suffix}\"" @@ -101,7 +103,7 @@ done popd > /dev/null -echo " - label: \":go: Integration test: test-build-zip\"" +echo " - label: \":go: Integration test: build-zip\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-build-zip" echo " agents:" echo " provider: \"gcp\"" @@ -109,14 +111,14 @@ echo " artifact_paths:" echo " - build/elastic-stack-dump/build-zip/logs/*.log" echo " - build/packages/*.sig" -echo " - label: \":go: Integration test: test-install-zip\"" +echo " - label: \":go: Integration test: install-zip\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip" echo " agents:" echo " provider: \"gcp\"" echo " artifact_paths:" echo " - build/elastic-stack-dump/install-zip/logs/*.log" -echo " - label: \":go: Integration test: test-install-zip-shellinit\"" +echo " - label: \":go: Integration test: install-zip-shellinit\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip-shellinit" echo " agents:" echo " provider: \"gcp\"" @@ -124,11 +126,11 @@ echo " artifact_paths:" echo " - build/elastic-stack-dump/install-zip-shellinit/logs/*.log" for independent_agent in false true; do - label_suffix = "" + label_suffix="" if [[ "$independent_agent" == "true" ]]; then - label_suffix= " (independent agent)" + label_suffix=" (independent agent)" fi - echo " - label: \":go: Integration test: test-system-test-flags${label_suffix}\"" + echo " - label: \":go: Integration test: system-flags${label_suffix}\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags" echo " agents:" echo " provider: \"gcp\"" @@ -136,7 +138,7 @@ for independent_agent in false true; do echo " ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}" done -echo " - label: \":go: Integration test: test-profiles-command\"" +echo " - label: \":go: Integration test: profiles-command\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-profiles-command" echo " env:" echo " DOCKER_COMPOSE_VERSION: \"false\"" @@ -146,7 +148,7 @@ echo " image: \"${LINUX_AGENT_IMAGE}\"" echo " cpu: \"8\"" echo " memory: \"4G\"" -echo " - label: \":go: Integration test: test-check-update-version\"" +echo " - label: \":go: Integration test: check-update-version\"" echo " command: ./.buildkite/scripts/integration_tests.sh -t test-check-update-version" echo " env:" echo " DEFAULT_VERSION_TAG: v0.80.0"