diff --git a/.backportrc.json b/.backportrc.json index 992e812590..edc8810f42 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -8,8 +8,8 @@ "prTitle": "{commitMessages} backport for {targetBranch}", "targetBranchChoices": [ { "name": "8.0", "checked": true }, - { "name": "7.16", "checked": true }, - { "name": "7.15", "checked": true } + { "name": "7.17", "checked": true }, + { "name": "7.16", "checked": true } ], "targetPRLabels": ["backport"], "upstream": "elastic/e2e-testing" diff --git a/.ci/jobs/e2e-testing-fleet-daily-mbp.yml b/.ci/jobs/e2e-testing-fleet-daily-mbp.yml index f0910384c3..b08aa3ca00 100644 --- a/.ci/jobs/e2e-testing-fleet-daily-mbp.yml +++ b/.ci/jobs/e2e-testing-fleet-daily-mbp.yml @@ -9,7 +9,7 @@ scm: - github: branch-discovery: no-pr - head-filter-regex: '(main|8\.0|7\.16|7\.15)' + head-filter-regex: '(main|8\.0|7\.17|7\.16)' discover-pr-forks-strategy: merge-current discover-pr-forks-trust: permission discover-pr-origin: merge-current diff --git a/.ci/jobs/e2e-testing-helm-daily-mbp.yml b/.ci/jobs/e2e-testing-helm-daily-mbp.yml index c74045b5c0..c5860b573b 100644 --- a/.ci/jobs/e2e-testing-helm-daily-mbp.yml +++ b/.ci/jobs/e2e-testing-helm-daily-mbp.yml @@ -9,7 +9,7 @@ scm: - github: branch-discovery: no-pr - head-filter-regex: '(main|8\.0|7\.16|7\.15)' + head-filter-regex: '(main|8\.0|7\.17|7\.16)' discover-pr-forks-strategy: merge-current discover-pr-forks-trust: permission discover-pr-origin: merge-current diff --git a/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml b/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml index a279323e36..5fc0481636 100644 --- a/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml +++ b/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml @@ -9,7 +9,7 @@ scm: - github: branch-discovery: no-pr - head-filter-regex: '(main|8\.0|7\.16|7\.15)' + head-filter-regex: '(main|8\.0|7\.17|7\.16)' discover-pr-forks-strategy: merge-current discover-pr-forks-trust: permission discover-pr-origin: merge-current diff --git a/.ci/jobs/e2e-testing-mbp.yml b/.ci/jobs/e2e-testing-mbp.yml index 3cbfb5f353..b44ab340cb 100644 --- a/.ci/jobs/e2e-testing-mbp.yml +++ b/.ci/jobs/e2e-testing-mbp.yml @@ -14,7 +14,7 @@ scm: - github: branch-discovery: no-pr - head-filter-regex: '(main|PR-.*|v\d\.d\.d|8\.0|7\.16|7\.15)' + head-filter-regex: '(main|PR-.*|v\d\.d\.d|8\.0|7\.17|7\.16)' discover-pr-forks-strategy: merge-current discover-pr-forks-trust: permission discover-pr-origin: merge-current diff --git a/.mergify.yml b/.mergify.yml index 881a952aa2..735e78ea16 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -30,11 +30,11 @@ pull_request_rules: branches: - "8.0" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - - name: backport patches to 7.16 branch + - name: backport patches to 7.17 branch conditions: - merged - base=main - - label=backport-v7.16.0 + - label=backport-v7.17.0 actions: backport: assignees: @@ -42,17 +42,17 @@ pull_request_rules: branches: - "7.16" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - - name: backport patches to 7.15 branch + - name: backport patches to 7.16 branch conditions: - merged - base=main - - label=backport-v7.15.0 + - label=backport-v7.16.0 actions: backport: assignees: - "{{ author }}" branches: - - "7.15" + - "7.16" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - name: delete head branch after merge conditions: