From e683359951f955d8dea34aae8393665ac692395f Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Tue, 10 Dec 2024 16:06:09 +0200 Subject: [PATCH 1/5] Always run Create S3 bucket S3 tests should run regardless of the previous testing suite outcome (green/red). The bucket creation was skipped when previous tests failed causes the main S3 suite to fail in the absence of a bucket. The only condition for the tests to be able to run is that the compile step is GREEN (compile_step_completed) --- common_factories.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common_factories.py b/common_factories.py index 09711ac4..67b20361 100644 --- a/common_factories.py +++ b/common_factories.py @@ -457,6 +457,7 @@ def addS3Tests(factory, mtrDbPool): factory.addStep( steps.MasterShellCommand( name="Create minio S3 bucket", + alwaysRun=True, command=[ "mc", "mb", From 6b5fc179b30b1033107c9e4578a5c4e7db3cf24a Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Tue, 10 Dec 2024 16:07:27 +0200 Subject: [PATCH 2/5] Disable S3 tests due to recent failures It looks like SSL Verify = NO doesn't work for 10.5 https://buildbot.mariadb.org/#/builders/369/builds/26765/steps/13/logs/stdio Will disable S3 tests until we figure it out. --- constants.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/constants.py b/constants.py index 376cb912..27c9ac6f 100644 --- a/constants.py +++ b/constants.py @@ -61,10 +61,7 @@ "ppc64le-ubuntu-2204", "amd64-freebsd-14", ] -builders_s3_mtr = [ - "amd64-ubuntu-2004-debug", - "s390x-sles-1506", -] +builders_s3_mtr = [] # Defines branches for which we save packages savedPackageBranches = branches_main + [ From 493a884ef2a1c30a48da73abc957cc67640f35e9 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 11 Dec 2024 12:17:13 +0200 Subject: [PATCH 3/5] Skip S3 tests for 10.5 --- common_factories.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/common_factories.py b/common_factories.py index 67b20361..58128fc8 100644 --- a/common_factories.py +++ b/common_factories.py @@ -454,6 +454,11 @@ 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", @@ -463,8 +468,7 @@ def addS3Tests(factory, mtrDbPool): "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( @@ -502,8 +506,7 @@ def addS3Tests(factory, mtrDbPool): "S3_USE_HTTP": "OFF", "S3_SSL_NO_VERIFY": "ON", }, - doStepIf=lambda props: hasS3(props) - and props.hasProperty("compile_step_completed"), + doStepIf=runS3, ) ) @@ -517,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, ) ) @@ -534,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 From fb853afbae10acbc8f38ebeedb9610116857f2c3 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 11 Dec 2024 12:18:09 +0200 Subject: [PATCH 4/5] Use a non-protected builder --- constants.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/constants.py b/constants.py index 27c9ac6f..39af5e9a 100644 --- a/constants.py +++ b/constants.py @@ -61,7 +61,10 @@ "ppc64le-ubuntu-2204", "amd64-freebsd-14", ] -builders_s3_mtr = [] +builders_s3_mtr = [ + "aarch64-ubuntu-2004-debug", + "s390x-sles-1506", +] # Defines branches for which we save packages savedPackageBranches = branches_main + [ From 9bc1a370626b7c7bddd788ce37ed3013b6874b85 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 11 Dec 2024 12:20:24 +0200 Subject: [PATCH 5/5] Change protocol version to Path and verify SSL --- common_factories.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common_factories.py b/common_factories.py index 58128fc8..834be0bc 100644 --- a/common_factories.py +++ b/common_factories.py @@ -496,7 +496,7 @@ 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"), @@ -504,7 +504,7 @@ def addS3Tests(factory, mtrDbPool): "%(prop:buildername)s-%(prop:buildnumber)s" ), "S3_USE_HTTP": "OFF", - "S3_SSL_NO_VERIFY": "ON", + "S3_PROTOCOL_VERSION": "Path", }, doStepIf=runS3, )