Skip to content

Commit b407edf

Browse files
Merge branch 'main' into disable-e2e-agent-req
2 parents dc9db67 + c8ac207 commit b407edf

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.mergify.yml

+13
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,16 @@ pull_request_rules:
207207
labels:
208208
- "backport"
209209
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
210+
- name: backport patches to 8.13 branch
211+
conditions:
212+
- merged
213+
- label=backport-v8.13.0
214+
actions:
215+
backport:
216+
assignees:
217+
- "{{ author }}"
218+
branches:
219+
- "8.13"
220+
labels:
221+
- "backport"
222+
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"

dev-tools/integration/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If you use change this version without a pinned one, please update
22
# .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml
3-
ELASTICSEARCH_VERSION=8.13.0-edaa0fd0-SNAPSHOT
3+
ELASTICSEARCH_VERSION=8.14.0-8dc05a81-SNAPSHOT
44
ELASTICSEARCH_USERNAME=elastic
55
ELASTICSEARCH_PASSWORD=changeme
66
TEST_ELASTICSEARCH_HOSTS=localhost:9200

internal/pkg/api/server_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ func Test_server_ClientCert(t *testing.T) {
295295
})
296296

297297
t.Run("valid client certs no certs requested", func(t *testing.T) {
298+
t.Skip("test is flakey see fleet-server/issue/3266")
298299
ctx, cancel := context.WithCancel(context.Background())
299300
defer cancel()
300301
ctx = testlog.SetLogger(t).WithContext(ctx)

0 commit comments

Comments
 (0)