Skip to content

Commit de88c71

Browse files
yaronkaikovyaronkaikov
committed
Merge branch 'master' into next-enterprise
* master: (52 commits) chore(deps): update dependency boto3 to v1.37.10 Update github action using curl method chore(deps): update scylladb-actions/jenkins-client action to v0.2.0 Use github action instead of curl method to trigger jenkins chore(deps): update dependency boto3 to v1.37.5 chore(deps): update dependency pytest to v8.3.5 Fix trigger_jenkins action - FOLDER_NAME regex trigger_jenkins: fix typo for enterprise releases trigger_jenkins: add support for old ent releases Fix jenkins job path for triggering job Trigger Jenkins job chore(deps): update dependency boto3 to v1.36.26 chore(deps): update dependency traceback-with-variables to v2.2.0 dist: fix incorrect license on rpm & deb packages chore(deps): update dependency psutil to v7 chore(deps): update dependency boto3 to v1.36.22 renovate: run every weekend chore(deps): update dependency boto3 to v1.36.21 chore(deps): update dependency boto3 to v1.36.18 scylla_install_image: disable cloud provider agents ...
2 parents d5b671b + d261f94 commit de88c71

23 files changed

+142
-1397
lines changed

‎.github/scripts/auto-backport.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def parse_args():
2929
parser.add_argument('--commits', default=None, type=str, help='Range of promoted commits.')
3030
parser.add_argument('--pull-request', type=int, help='Pull request number to be backported')
3131
parser.add_argument('--head-commit', type=str, required=is_pull_request(), help='The HEAD of target branch after the pull request specified by --pull-request is merged')
32+
parser.add_argument('--label', type=str, required=is_pull_request(), help='Backport label name when --pull-request is defined')
3233
return parser.parse_args()
3334

3435

@@ -47,7 +48,11 @@ def create_pull_request(repo, new_branch_name, base_branch_name, pr, backport_pr
4748
)
4849
logging.info(f"Pull request created: {backport_pr.html_url}")
4950
backport_pr.add_to_assignees(pr.user)
50-
backport_pr.add_to_labels("conflicts") if is_draft else None
51+
if is_draft:
52+
backport_pr.add_to_labels("conflicts")
53+
pr_comment = f"@{pr.user.login} - This PR has conflicts, therefore it was moved to `draft` \n"
54+
pr_comment += "Please resolve them and mark this PR as ready for review"
55+
backport_pr.create_issue_comment(pr_comment)
5156
logging.info(f"Assigned PR to original author: {pr.user}")
5257
return backport_pr
5358
except GithubException as e:
@@ -141,14 +146,17 @@ def main():
141146
closed_prs = [pr]
142147

143148
for pr in closed_prs:
144-
labels = [label.name for label in pr.labels]
145-
backport_labels = [label for label in labels if backport_label_pattern.match(label)]
146-
if promoted_label not in labels:
147-
print(f'no {promoted_label} label: {pr.number}')
148-
continue
149-
if not backport_labels:
150-
print(f'no backport label: {pr.number}')
151-
continue
149+
if args.pull_request:
150+
backport_labels = [args.label]
151+
else:
152+
labels = [label.name for label in pr.labels]
153+
backport_labels = [label for label in labels if backport_label_pattern.match(label)]
154+
if promoted_label not in labels:
155+
print(f'no {promoted_label} label: {pr.number}')
156+
continue
157+
if not backport_labels:
158+
print(f'no backport label: {pr.number}')
159+
continue
152160
commits = get_pr_commits(repo, pr, stable_branch, start_commit)
153161
logging.info(f"Found PR #{pr.number} with commit {commits} and the following labels: {backport_labels}")
154162
for backport_label in backport_labels:

‎.github/workflows/add-label-when-promoted.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches:
66
- master
77
- next-*.*
8-
- enterprise
98
pull_request_target:
109
types: [labeled]
11-
branches: [master, next, enterprise]
10+
branches: [master, next]
11+
12+
env:
13+
DEFAULT_BRANCH: 'master'
1214

1315
jobs:
1416
check-commit:
@@ -21,19 +23,11 @@ jobs:
2123
env:
2224
GITHUB_CONTEXT: ${{ toJson(github) }}
2325
run: echo "$GITHUB_CONTEXT"
24-
- name: Set Default Branch
25-
id: set_branch
26-
run: |
27-
if [[ "${{ github.repository }}" == *enterprise* ]]; then
28-
echo "stable_branch=enterprise" >> $GITHUB_OUTPUT
29-
else
30-
echo "stable_branch=master" >> $GITHUB_OUTPUT
31-
fi
3226
- name: Checkout repository
3327
uses: actions/checkout@v4
3428
with:
3529
repository: ${{ github.repository }}
36-
ref: ${{ env.stable_branch }}
30+
ref: ${{ env.DEFAULT_BRANCH }}
3731
token: ${{ secrets.AUTO_BACKPORT_TOKEN }}
3832
fetch-depth: 0 # Fetch all history for all tags and branches
3933
- name: Set up Git identity
@@ -49,7 +43,7 @@ jobs:
4943
GITHUB_TOKEN: ${{ secrets.AUTO_BACKPORT_TOKEN }}
5044
run: python .github/scripts/search_commits.py --commits ${{ github.event.before }}..${{ github.sha }} --repository ${{ github.repository }} --ref ${{ github.ref }}
5145
- name: Run auto-backport.py when promotion completed
52-
if: github.event_name == 'push' && github.ref == format('refs/heads/{0}', steps.set_branch.outputs.stable_branch)
46+
if: github.event_name == 'push' && github.ref == format('refs/heads/{0}', env.DEFAULT_BRANCH)
5347
env:
5448
GITHUB_TOKEN: ${{ secrets.AUTO_BACKPORT_TOKEN }}
5549
run: python .github/scripts/auto-backport.py --repo ${{ github.repository }} --base-branch ${{ github.ref }} --commits ${{ github.event.before }}..${{ github.sha }}
@@ -68,4 +62,4 @@ jobs:
6862
if: github.event_name == 'pull_request_target' && steps.check_label.outputs.backport_label == 'true' && github.event.pull_request.merged == true
6963
env:
7064
GITHUB_TOKEN: ${{ secrets.AUTO_BACKPORT_TOKEN }}
71-
run: python .github/scripts/auto-backport.py --repo ${{ github.repository }} --base-branch ${{ github.ref }} --pull-request ${{ github.event.pull_request.number }} --head-commit ${{ github.event.pull_request.base.sha }}
65+
run: python .github/scripts/auto-backport.py --repo ${{ github.repository }} --base-branch ${{ github.ref }} --pull-request ${{ github.event.pull_request.number }} --head-commit ${{ github.event.pull_request.base.sha }} --label ${{ github.event.label.name }}

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: Unittest and Build RPMs
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Setup python
18-
uses: actions/setup-python@v3
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: 3.11
2121
architecture: x64

‎.github/workflows/trigger_jenkins.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Trigger next-machine-image gating
2+
3+
on:
4+
push:
5+
branches:
6+
- next**
7+
8+
jobs:
9+
trigger-jenkins:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Determine Jenkins Job Name
13+
run: |
14+
if [[ "${{ github.ref_name }}" == "next" ]]; then
15+
FOLDER_NAME="scylla-master"
16+
elif [[ "${{ github.ref_name }}" == "next-enterprise" ]]; then
17+
FOLDER_NAME="scylla-enterprise"
18+
else
19+
VERSION=$(echo "${{ github.ref_name }}" | awk -F'-' '{print $2}')
20+
if [[ "$VERSION" =~ ^202[0-4]\.[0-9]+$ ]]; then
21+
FOLDER_NAME="enterprise-$VERSION"
22+
elif [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
23+
FOLDER_NAME="scylla-$VERSION"
24+
fi
25+
fi
26+
echo "JOB_NAME=${FOLDER_NAME}/job/next-machine-image" >> $GITHUB_ENV
27+
28+
- name: Trigger Jenkins Job
29+
env:
30+
JENKINS_USER: ${{ secrets.JENKINS_USERNAME }}
31+
JENKINS_API_TOKEN: ${{ secrets.JENKINS_TOKEN }}
32+
JENKINS_URL: "https://jenkins.scylladb.com"
33+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
34+
run: |
35+
echo "Triggering Jenkins Job: $JOB_NAME"
36+
if ! curl -X POST "$JENKINS_URL/job/$JOB_NAME/buildWithParameters" --fail --user "$JENKINS_USER:$JENKINS_API_TOKEN" -i -v; then
37+
echo "Error: Jenkins job trigger failed"
38+
39+
# Send Slack message
40+
curl -X POST -H 'Content-type: application/json' \
41+
-H "Authorization: Bearer $SLACK_BOT_TOKEN" \
42+
--data '{
43+
"channel": "#releng-team",
44+
"text": "🚨 @here '$JOB_NAME' failed to be triggered, please check https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} for more details",
45+
"icon_emoji": ":warning:"
46+
}' \
47+
https://slack.com/api/chat.postMessage
48+
49+
exit 1
50+
fi

‎Makefile

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎SCYLLA-VERSION-GEN

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/bin/sh
22

3-
PRODUCT=scylla-enterprise
4-
VERSION=2024.3.0-dev
5-
3+
PRODUCT=scylla
4+
VERSION=2025.2.0-dev
65

76
if test -f version
87
then

‎common/aws_io_params.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,11 +543,21 @@ i4i.8xlarge:
543543
read_bandwidth: 3115819008
544544
write_iops: 239980
545545
write_bandwidth: 2289285120
546+
i4i.12xlarge:
547+
read_iops: 294982
548+
read_bandwidth: 3116245760
549+
write_iops: 67283
550+
write_bandwidth: 2287695786
546551
i4i.16xlarge:
547552
read_iops: 374273
548553
read_bandwidth: 3088962816
549554
write_iops: 240185
550555
write_bandwidth: 2292813568
556+
i4i.24xlarge:
557+
read_iops: 282557
558+
read_bandwidth: 3116171434
559+
write_iops: 67003
560+
write_bandwidth: 2288658688
551561
i4i.32xlarge:
552562
read_iops: 374273
553563
read_bandwidth: 3095612416
@@ -558,3 +568,23 @@ i4i.metal:
558568
read_bandwidth: 3088599296
559569
write_iops: 239549
560570
write_bandwidth: 2302438912
571+
i7ie.large:
572+
read_iops: 58449
573+
read_bandwidth: 574854656
574+
write_iops: 47145
575+
write_bandwidth: 253132917
576+
i7ie.xlarge:
577+
read_iops: 117257
578+
read_bandwidth: 1148572714
579+
write_iops: 94180
580+
write_bandwidth: 505684885
581+
i7ie.2xlarge:
582+
read_iops: 117257
583+
read_bandwidth: 1148572714
584+
write_iops: 94180
585+
write_bandwidth: 505684885
586+
i7ie.ALL:
587+
read_iops: 352834
588+
read_bandwidth: 3422623232
589+
write_iops: 119327
590+
write_bandwidth: 1526442410

‎dist/debian/control.template

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ Rules-Requires-Root: no
99
Package: %{product}-machine-image
1010
Architecture: all
1111
Depends: %{product}, %{product}-python3, ${shlibs:Depends}, ${misc:Depends}
12-
Replaces: scylla-machine-image
12+
Replaces: scylla-enterprise-machine-image (<< 2025.1.0~)
13+
Breaks: scylla-enterprise-machine-image (<< 2025.1.0~)
1314
Description: Scylla Machine Image
1415
Scylla is a highly scalable, eventually consistent, distributed,
1516
partitioned row DB.
17+
18+
Package: scylla-enterprise-machine-image
19+
Depends: %{product}-machine-image (= ${binary:Version})
20+
Architecture: all
21+
Priority: optional
22+
Section: oldlibs
23+
Description: transitional package
24+
This is a transitional package. It can safely be removed.

0 commit comments

Comments
 (0)