Skip to content

Commit 23282b5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into system-benchmarks-improvements
2 parents 5fa9987 + 103eb96 commit 23282b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4122
-473
lines changed

.ci/Jenkinsfile

Lines changed: 0 additions & 77 deletions
This file was deleted.

.ci/jobs/defaults.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.ci/jobs/elastic-package.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.ci/jobs/folders.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.ci/jobs/package-storage-publish.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.ci/package-storage-publish.groovy

Lines changed: 0 additions & 166 deletions
This file was deleted.

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
queue_rules:
22
- name: default
33
conditions:
4-
- check-success=elastic-package/pr-merge
4+
- check-success=buildkite/elastic-package
55

66
pull_request_rules:
77
- name: automatic approval for Dependabot pull requests
@@ -13,7 +13,7 @@ pull_request_rules:
1313
message: Automatically approving dependabot
1414
- name: automatic merge of bot 🤖
1515
conditions:
16-
- check-success=elastic-package/pr-merge
16+
- check-success=buildkite/elastic-package
1717
- check-success=CLA
1818
- base=main
1919
- author~=^dependabot(|-preview)\[bot\]$

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/stretchr/testify v1.8.4
3434
golang.org/x/tools v0.11.0
3535
gopkg.in/yaml.v3 v3.0.1
36-
gotest.tools/gotestsum v1.10.0
36+
gotest.tools/gotestsum v1.10.1
3737
helm.sh/helm/v3 v3.12.1
3838
honnef.co/go/tools v0.4.3
3939
k8s.io/apimachinery v0.27.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C
627627
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
628628
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
629629
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
630-
gotest.tools/gotestsum v1.10.0 h1:lVO4uQJoxdsJb7jgmr1fg8QW7zGQ/tuqvsq5fHKyoHQ=
631-
gotest.tools/gotestsum v1.10.0/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w=
630+
gotest.tools/gotestsum v1.10.1 h1:TOV5xZVd5HDscBLSrPXpc4/MQm6QQr/YSI9iDC62d7E=
631+
gotest.tools/gotestsum v1.10.1/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w=
632632
gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
633633
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
634634
helm.sh/helm/v3 v3.12.1 h1:lzU7etZX24A6BTMXYQF3bFq0ECfD8s+fKlNBBL8AbEc=

0 commit comments

Comments
 (0)