Skip to content
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

MDBF 135 - Don't run S3 for 10.5 / Use non-protected builders / Use SSL verification #663

Merged
merged 5 commits into from
Dec 11, 2024
Merged

MDBF 135 - Don't run S3 for 10.5 / Use non-protected builders / Use SSL verification #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e683359
Always run Create S3 bucket
RazvanLiviuVarzaru Dec 10, 2024
6b5fc17
Disable S3 tests due to recent failures
RazvanLiviuVarzaru Dec 10, 2024
493a884
Skip S3 tests for 10.5
RazvanLiviuVarzaru Dec 11, 2024
fb853af
Use a non-protected builder
RazvanLiviuVarzaru Dec 11, 2024
9bc1a37
Change protocol version to Path and verify SSL
RazvanLiviuVarzaru Dec 11, 2024
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
22 changes: 12 additions & 10 deletions common_factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,16 +454,21 @@ def addGaleraTests(factory, mtrDbPool):


def addS3Tests(factory, mtrDbPool):
runS3 = (
lambda props: hasS3(props)
and props.hasProperty("compile_step_completed")
and "10.5" not in str(props.getProperty("master_branch"))
)
factory.addStep(
steps.MasterShellCommand(
name="Create minio S3 bucket",
alwaysRun=True,
command=[
"mc",
"mb",
util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
],
doStepIf=lambda props: hasS3(props)
and props.hasProperty("compile_step_completed"),
doStepIf=runS3,
)
)
factory.addStep(
Expand Down Expand Up @@ -491,18 +496,17 @@ def addS3Tests(factory, mtrDbPool):
dbpool=mtrDbPool,
autoCreateTables=True,
env={
"S3_HOST_NAME": "135.181.42.57",
"S3_HOST_NAME": "minio.mariadb.org",
"S3_PORT": "443",
"S3_ACCESS_KEY": util.Interpolate("%(secret:minio_access_key)s"),
"S3_SECRET_KEY": util.Interpolate("%(secret:minio_secret_key)s"),
"S3_BUCKET": util.Interpolate(
"%(prop:buildername)s-%(prop:buildnumber)s"
),
"S3_USE_HTTP": "OFF",
"S3_SSL_NO_VERIFY": "ON",
"S3_PROTOCOL_VERSION": "Path",
},
doStepIf=lambda props: hasS3(props)
and props.hasProperty("compile_step_completed"),
doStepIf=runS3,
)
)

Expand All @@ -516,8 +520,7 @@ def addS3Tests(factory, mtrDbPool):
"--force",
util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
],
doStepIf=lambda props: hasS3(props)
and props.hasProperty("compile_step_completed"),
doStepIf=runS3,
)
)

Expand All @@ -533,8 +536,7 @@ def addS3Tests(factory, mtrDbPool):
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
),
],
doStepIf=lambda props: hasS3(props)
and props.hasProperty("compile_step_completed"),
doStepIf=runS3,
)
)
return factory
Expand Down
2 changes: 1 addition & 1 deletion constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"amd64-freebsd-14",
]
builders_s3_mtr = [
"amd64-ubuntu-2004-debug",
"aarch64-ubuntu-2004-debug",
"s390x-sles-1506",
]

Expand Down