Skip to content

Commit ed6b26d

Browse files
Set MC_HOST_minio for MasterShellStep
1 parent a7b3d2c commit ed6b26d

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

common_factories.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,11 @@ def addS3Tests(factory, mtrDbPool):
485485
"mb",
486486
util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
487487
],
488+
env={
489+
"MC_HOST_minio": util.Interpolate(
490+
"https://%(secret:minio_access_key)s:%(secret:minio_secret_key)s@minio.mariadb.org"
491+
),
492+
},
488493
doStepIf=runS3,
489494
)
490495
)
@@ -538,6 +543,11 @@ def addS3Tests(factory, mtrDbPool):
538543
"--force",
539544
util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
540545
],
546+
env={
547+
"MC_HOST_minio": util.Interpolate(
548+
"https://%(secret:minio_access_key)s:%(secret:minio_secret_key)s@minio.mariadb.org"
549+
),
550+
},
541551
doStepIf=runS3,
542552
)
543553
)

configuration/builders/sequences/helpers.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,13 @@ def get_mtr_s3_steps(
226226
steps = []
227227
steps.append(
228228
MasterShellStep(
229-
command=CreateS3Bucket(bucket=f"%(prop:buildername)s-%(prop:buildnumber)s")
229+
command=CreateS3Bucket(bucket=f"%(prop:buildername)s-%(prop:buildnumber)s"),
230+
env_vars=[
231+
(
232+
"MC_HOST_minio",
233+
"https://%(secret:minio_access_key)s:%(secret:minio_secret_key)s@minio.mariadb.org",
234+
),
235+
],
230236
)
231237
)
232238

@@ -272,6 +278,12 @@ def get_mtr_s3_steps(
272278
steps.append(
273279
MasterShellStep(
274280
command=DeleteS3Bucket(bucket=f"%(prop:buildername)s-%(prop:buildnumber)s"),
281+
env_vars=[
282+
(
283+
"MC_HOST_minio",
284+
"https://%(secret:minio_access_key)s:%(secret:minio_secret_key)s@minio.mariadb.org",
285+
),
286+
],
275287
options=StepOptions(alwaysRun=True),
276288
),
277289
)

0 commit comments

Comments
 (0)