From 7e8b7367fda2edf110167e80f4cc52dc98ed8928 Mon Sep 17 00:00:00 2001 From: elasticmachine Date: Wed, 5 Mar 2025 11:12:40 +0000 Subject: [PATCH 1/4] Test elastic-package from PR 2454 - 4d95ae884ab01d5d74fd818970c10f2cedcec327 --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2be43614e26..a051d7cf30b 100644 --- a/go.mod +++ b/go.mod @@ -231,3 +231,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +replace github.com/elastic/elastic-package => github.com/mrodm/elastic-package v0.53.1-0.20250305105520-4d95ae884ab0 diff --git a/go.sum b/go.sum index 92e2e449172..2182bf2ee30 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0 h1:sx1lpZuTG5suJuvgix4FWQFCLFFbzkoOmPoHWYOPLCY= github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0/go.mod h1:2/30n+2QRzRzus4TPVUV1T3U/j8g2ItUgvP0pcpjLGk= -github.com/elastic/elastic-package v0.110.1 h1:FgzH+Zi2FiDFFSNppr+XfQYLAZQq6+ie/nzY65s1f2w= -github.com/elastic/elastic-package v0.110.1/go.mod h1:MhEPBf3q0KAue3QVXYxxfzTURJf4YkY8okQJFKKSjHk= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A= @@ -373,6 +371,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/mrodm/elastic-package v0.53.1-0.20250305105520-4d95ae884ab0 h1:qJmMhwIZUFKo5TsUhBVpjWLff2NqM5ED4nR2Z5j9QmI= +github.com/mrodm/elastic-package v0.53.1-0.20250305105520-4d95ae884ab0/go.mod h1:MhEPBf3q0KAue3QVXYxxfzTURJf4YkY8okQJFKKSjHk= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= From 29c3da2d13eae382b421dabf00bd3356d2ec4a78 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 5 Mar 2025 12:15:00 +0100 Subject: [PATCH 2/4] Test gcp and network_traffic in 9.1.0-SNAPSHOT --- .buildkite/pipeline.yml | 1 + .buildkite/scripts/common.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 29daa705014..6926524f4ac 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -8,6 +8,7 @@ env: YQ_VERSION: 'v4.35.2' JQ_VERSION: '1.7' GH_CLI_VERSION: "2.29.0" + STACK_VERSION: "9.1.0-SNAPSHOT" # Agent images used in pipeline steps LINUX_AGENT_IMAGE: "golang:${GO_VERSION}" diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index 0193c26770e..f1423a73c09 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -757,7 +757,7 @@ teardown_test_package() { } list_all_directories() { - find . -maxdepth 1 -mindepth 1 -type d | xargs -I {} basename {} | sort + find . -maxdepth 1 -mindepth 1 -type d | xargs -I {} basename {} | sort |grep -E '^(gcp|network_traffic)$' } check_package() { From bcadda69fcf0eeed85fcecb378fff9227d3ec0d3 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 5 Mar 2025 12:24:59 +0100 Subject: [PATCH 3/4] Revert "Test gcp and network_traffic in 9.1.0-SNAPSHOT" This reverts commit 29c3da2d13eae382b421dabf00bd3356d2ec4a78. --- .buildkite/pipeline.yml | 1 - .buildkite/scripts/common.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6926524f4ac..29daa705014 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -8,7 +8,6 @@ env: YQ_VERSION: 'v4.35.2' JQ_VERSION: '1.7' GH_CLI_VERSION: "2.29.0" - STACK_VERSION: "9.1.0-SNAPSHOT" # Agent images used in pipeline steps LINUX_AGENT_IMAGE: "golang:${GO_VERSION}" diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index f1423a73c09..0193c26770e 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -757,7 +757,7 @@ teardown_test_package() { } list_all_directories() { - find . -maxdepth 1 -mindepth 1 -type d | xargs -I {} basename {} | sort |grep -E '^(gcp|network_traffic)$' + find . -maxdepth 1 -mindepth 1 -type d | xargs -I {} basename {} | sort } check_package() { From 583164b84911500a65dc9c5772fce7bf7e8a37d5 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 5 Mar 2025 12:26:38 +0100 Subject: [PATCH 4/4] Test with 9.1.0-SNAPSHOT --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 29daa705014..6926524f4ac 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -8,6 +8,7 @@ env: YQ_VERSION: 'v4.35.2' JQ_VERSION: '1.7' GH_CLI_VERSION: "2.29.0" + STACK_VERSION: "9.1.0-SNAPSHOT" # Agent images used in pipeline steps LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"