Skip to content

[8.x] Get 8.x branch set up (#2813) #2814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 1 commit into from
Sep 10, 2024
Merged

[8.x] Get 8.x branch set up (#2813) #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion .backportrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"targetBranchChoices": [
{ "name": "main", "checked": true },
"8.x",
"8.15",
"8.14",
"8.13",
Expand All @@ -12,7 +13,8 @@
"fork": false,
"targetPRLabels": ["backport"],
"branchLabelMapping": {
"^v8.16.0(.0)?$": "main",
"^v9.0.0$": "main",
"^v8.16.0$": "8.x",
"^v(\\d+).(\\d+)(.\\d+)+$": "$1.$2"
},
"upstream": "elastic/connectors"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ steps:
# ----
- group: ":truck: Packaging and DRA"
key: "mbp_dra_group"
if: "(build.branch == \"main\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
if: "(build.branch == \"main\" || build.branch == \"8.x\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here
depends_on:
- "lint"
- "unit_tests"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/publish/dra/init_dra_publishing.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export PRODUCT_NAME="connectors"
export GIT_REPO="connectors"

# set PUBLISH_SNAPSHOT and PUBLISH_STAGING based on the branch
if [[ "${BUILDKITE_BRANCH:-}" =~ (main|[0-9]\.[0-9x]*$) ]]; then
if [[ "${BUILDKITE_BRANCH:-}" =~ (main|8\.x|[0-9]\.[0-9x]*$) ]]; then
export PUBLISH_SNAPSHOT="true"
fi
if [[ "${BUILDKITE_BRANCH:-}" =~ ([0-9]\.[0-9x]*$) ]]; then
Expand Down
20 changes: 12 additions & 8 deletions catalog-info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ spec:
branch: main
cronline: '@daily'
message: "Builds, tests, and pushes daily `main` DRA artifacts"
Daily 8.x:
branch: 8.x
cronline: '@daily'
message: "Builds, tests, and pushes daily `8.x` DRA artifacts"
provider_settings:
skip_pull_request_builds_for_existing_commits: false
build_pull_request_labels_changed: true
Expand Down Expand Up @@ -93,14 +97,14 @@ spec:
trigger_mode: "none"
repository: "elastic/connectors"
schedules:
Daily 8_14:
branch: '8.14'
cronline: '@daily'
message: "Runs daily `8.14` e2e test"
Daily 8_15:
branch: '8.15'
cronline: '@daily'
message: "Runs daily `8.15` e2e test"
Daily 8_x:
branch: '8.x'
cronline: '@daily'
message: "Runs daily `8.x` e2e test"
Daily main:
branch: main
cronline: '@daily'
Expand Down Expand Up @@ -139,14 +143,14 @@ spec:
trigger_mode: "none"
repository: "elastic/connectors"
schedules:
Daily 8_14:
branch: '8.14'
cronline: '@daily'
message: "Runs daily `8.14` e2e aarch64 test"
Daily 8_15:
branch: '8.15'
cronline: '@daily'
message: "Runs daily `8.15` e2e aarch64 test"
Daily 8_x:
branch: '8.x'
cronline: '@daily'
message: "Runs daily `8.x` e2e aarch64 test"
Daily main:
branch: main
cronline: '@daily'
Expand Down