From 1bce3a91e181d99b2065584809da9730edfdb757 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 13 Nov 2024 12:26:04 +1100 Subject: [PATCH] docker library: trigger operator with mariadb_version Without the MariaDB version specified, the operator was depending on a tag to identify the version. As we trigger by sha this needs to be specified. Depends on https://github.com/mariadb-operator/mariadb-operator/pull/1048 --- master-nonlatent/master.cfg | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg index b206844a..637d8a79 100644 --- a/master-nonlatent/master.cfg +++ b/master-nonlatent/master.cfg @@ -773,15 +773,18 @@ f_dockerlibrary.addStep( steps.ShellCommand( name="test operator with image", command=[ - 'bash', - '-xc', + "bash", + "-xc", util.Interpolate( - 'gh workflow run %s --repo mariadb-operator/mariadb-operator -f mariadb_image=quay.io/mariadb-foundation/mariadb-devel@%s', - util.Property('GH_WORKFLOW', default='test-image.yml'), - util.Property('lastsha'), + "gh workflow run %s --repo mariadb-operator/mariadb-operator -f mariadb_image=quay.io/mariadb-foundation/mariadb-devel@%s -f mariadb_version=%s", + util.Property("GH_WORKFLOW", default="test-image.yml"), + util.Property("lastsha"), + util.Property("master_branch"), ), ], - doStepIf=lambda step: (str(step.getProperty("lastsha")) != "null" and step.hasProperty("lastsha")), + doStepIf=lambda step: ( + str(step.getProperty("lastsha")) != "null" and step.hasProperty("lastsha") + ), ) )