diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go index 347a11b380..9de69b4088 100644 --- a/e2e/_suites/fleet/ingest_manager_test.go +++ b/e2e/_suites/fleet/ingest_manager_test.go @@ -123,7 +123,7 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) { } profileEnv["kibanaDockerNamespace"] = "kibana" - if strings.HasPrefix(kibanaVersion, "pr") { + if strings.HasPrefix(kibanaVersion, "pr") || e2e.IsCommit(kibanaVersion) { // because it comes from a PR profileEnv["kibanaDockerNamespace"] = "observability-ci" } diff --git a/e2e/utils.go b/e2e/utils.go index 1d67b7ca32..34ff498547 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -14,6 +14,7 @@ import ( "os" "path" "path/filepath" + "regexp" "strings" "time" @@ -522,6 +523,13 @@ func getBucketSearchNextPageParam(jsonParsed *gabs.Container) string { return "&pageToken=" + nextPageToken } +// IsCommit returns true if the string matches commit format +func IsCommit(s string) bool { + re := regexp.MustCompile(`\b[0-9a-f]{5,40}\b`) + + return re.MatchString(s) +} + func processBucketSearchPage(jsonParsed *gabs.Container, currentPage int, bucket string, prefix string, object string) (string, error) { items := jsonParsed.Path("items").Children() diff --git a/e2e/utils_test.go b/e2e/utils_test.go index 0d1d154c43..b37c1c5de4 100644 --- a/e2e/utils_test.go +++ b/e2e/utils_test.go @@ -313,6 +313,22 @@ func TestGetGCPBucketCoordinates_Snapshots(t *testing.T) { }) } +func TestIsCommit(t *testing.T) { + t.Run("Returns true with commits", func(t *testing.T) { + assert.True(t, IsCommit("abcdef1234")) + assert.True(t, IsCommit("a12345")) + assert.True(t, IsCommit("abcdef1")) + }) + + t.Run("Returns false with non-commits", func(t *testing.T) { + assert.False(t, IsCommit("master")) + assert.False(t, IsCommit("7.x")) + assert.False(t, IsCommit("7.12.x")) + assert.False(t, IsCommit("7.11.x")) + assert.False(t, IsCommit("pr12345")) + }) +} + func TestProcessBucketSearchPage_CommitFound(t *testing.T) { // retrieving last element in commits.json object := "024b732844d40bdb2bf806480af2b03fcb8fbdbe/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz"