From 9edfb50918b4b078ff80345700005d4f48d16615 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 24 Apr 2024 08:58:05 +1000
Subject: [PATCH] wordpress: no environ property

---
 master-nonlatent/master.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
index 85fe01da..3416ff3e 100644
--- a/master-nonlatent/master.cfg
+++ b/master-nonlatent/master.cfg
@@ -600,7 +600,7 @@ f_wordpress.addStep(
             "sh",
             "-c",
             util.Interpolate(
-                "podman pod exists wptest%(prop:environ)s || podman pod create -n wptest%(prop:environ)s"
+                "podman pod exists wptest || podman pod create -n wptest"
             ),
         ],
     )
@@ -613,9 +613,9 @@ f_wordpress.addStep(
             "run",
             "-d",
             "--pod",
-            util.Interpolate("wptest%(prop:environ)s"),
+            util.Interpolate("wptest"),
             "--name",
-            util.Interpolate("mariadb%(prop:environ)s"),
+            util.Interpolate("mariadb"),
             "--env",
             "MARIADB_USER=wptest",
             "--env",
@@ -639,7 +639,7 @@ f_wordpress.addStep(
             "sh",
             "-c",
             util.Interpolate(
-                'until podman healthcheck run mariadb%(prop:environ)s; do sleep 1; echo "not yet"; done; podman logs mariadb%(prop:environ)s'
+                'until podman healthcheck run mariadb; do sleep 1; echo "not yet"; done; podman logs mariadb'
             ),
         ],
         maxTime=20,
@@ -652,7 +652,7 @@ f_wordpress.addStep(
             "podman",
             "run",
             "--pod",
-            util.Interpolate("wptest%(prop:environ)s"),
+            util.Interpolate("wptest"),
             "--rm",
             "quay.io/mariadb-foundation/bb-ecosystem:wordpress_phpunit_test_runner",
         ],
@@ -661,7 +661,7 @@ f_wordpress.addStep(
 f_wordpress.addStep(
     steps.ShellCommand(
         name="Stop MariaDB",
-        command=["podman", "kill", util.Interpolate("mariadb%(prop:environ)s")],
+        command=["podman", "kill", util.Interpolate("mariadb")],
         alwaysRun=True,
     )
 )