Skip to content

Commit b20480b

Browse files
Merge branch '8.14' into mergify/bp/8.14/pr-4846
2 parents 24df603 + 9f6413a commit b20480b

File tree

7 files changed

+59
-8
lines changed

7 files changed

+59
-8
lines changed

.buildkite/pipeline.yml

+48
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,51 @@ steps:
232232
image: "family/core-ubuntu-2204"
233233
env:
234234
- GH_VERSION=2.4.0
235+
236+
# Trigger for pull requests
237+
- label: "Trigger Integration tests for Pull request"
238+
if: |
239+
(build.pull_request.id != null && !build.env("GITHUB_PR_LABELS") =~ /skip-it/) ||
240+
build.env("GITHUB_PR_TRIGGER_COMMENT") =~ /.*extended.*/
241+
242+
plugins:
243+
- monorepo-diff#v1.0.1:
244+
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
245+
watch:
246+
- path:
247+
- internal/
248+
- dev-tools/
249+
- pkg/
250+
- testing/
251+
- version/
252+
- specs/
253+
- .agent-versions.json
254+
- .go-version
255+
- .package-version
256+
- go.mod
257+
- go.sum
258+
- magefile.go
259+
- main.go
260+
261+
- .buildkite/integration.pipeline.yml
262+
- .buildkite/pipeline.yml
263+
- .buildkite/scripts/
264+
- .buildkite/hooks/
265+
266+
config:
267+
trigger: "elastic-agent-extended-testing"
268+
build:
269+
commit: "${BUILDKITE_COMMIT}"
270+
branch: "${BUILDKITE_BRANCH}"
271+
env:
272+
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
273+
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
274+
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
275+
276+
# Trigger for branches
277+
- label: "Triggering Integration tests for branches"
278+
if: build.pull_request.id == null
279+
trigger: "elastic-agent-extended-testing"
280+
build:
281+
commit: "${BUILDKITE_COMMIT}"
282+
branch: "${BUILDKITE_BRANCH}"

.buildkite/pull-requests.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"set_commit_status": true,
1010
"build_on_commit": true,
1111
"build_on_comment": true,
12-
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
13-
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
14-
"skip_ci_labels": [ ],
12+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it|extended))|^/test\\W*(?:extended|)",
13+
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it|extended))|^/test\\W*(?:extended|)",
14+
"skip_ci_labels": [ "skip-ci" ],
1515
"skip_target_branches": [ ],
16-
"skip_ci_on_only_changed": [ ],
16+
"skip_ci_on_only_changed": [ "^.ci/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
1717
"always_require_ci_on_changed": [ ]
1818
},
1919
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: bug-fix
2+
summary: Increase removal timeout when uninstall
3+
component: "elastic-agent"

deploy/kubernetes/elastic-agent-managed-kubernetes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
dnsPolicy: ClusterFirstWithHostNet
3131
containers:
3232
- name: elastic-agent
33-
image: docker.elastic.co/beats/elastic-agent:8.14.1
33+
image: docker.elastic.co/beats/elastic-agent:8.14.2
3434
env:
3535
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
3636
- name: FLEET_ENROLL

deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ spec:
704704
# mountPath: /etc/elastic-agent/inputs.d
705705
containers:
706706
- name: elastic-agent-standalone
707-
image: docker.elastic.co/beats/elastic-agent:8.14.1
707+
image: docker.elastic.co/beats/elastic-agent:8.14.2
708708
args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
709709
env:
710710
# The basic authentication username used to connect to Elasticsearch

internal/pkg/agent/install/uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func checkForUnprivilegedVault(ctx context.Context, opts ...vault.OptionFunc) (b
168168
// to an ERROR_SHARING_VIOLATION. RemovePath will retry up to 2
169169
// seconds if it keeps getting that error.
170170
func RemovePath(path string) error {
171-
const arbitraryTimeout = 30 * time.Second
171+
const arbitraryTimeout = 60 * time.Second
172172
start := time.Now()
173173
var lastErr error
174174
for time.Since(start) <= arbitraryTimeout {

version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
package version
66

7-
const defaultBeatVersion = "8.14.1"
7+
const defaultBeatVersion = "8.14.2"
88
const Agent = defaultBeatVersion

0 commit comments

Comments
 (0)