Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

chore: retire 7.15 adding 7.17 #1938

Merged
merged 3 commits into from
Dec 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs/e2e-testing-fleet-daily-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs/e2e-testing-helm-daily-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs/e2e-testing-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@ 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:
- "{{ author }}"
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:
Expand Down