Merge branch 'bugfix/ZENKO-4877' into w/2.7/bugfix/ZENKO-4877

scality · Aug 21, 2024 · 5b1712e · 5b1712e
2 parents 48eb607 + 94361c9
commit 5b1712e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/.github/scripts/end2end/configs/zenkoversion.yaml b/.github/scripts/end2end/configs/zenkoversion.yaml
@@ -110,7 +110,7 @@ spec:
         image: '${JMX_JAVAAGENT_IMAGE}'
         tag: '${JMX_JAVAAGENT_TAG}'
       listener:
-        image: haproxy
+        image: '${HAPROXY_IMAGE}'
         tag: '${HAPROXY_TAG}'
     vault:
       image: '${VAULT_IMAGE}'

diff --git a/monitoring/pra/alerts.yaml → monitoring/dr/alerts.yaml b/monitoring/pra/alerts.yaml → monitoring/dr/alerts.yaml
diff --git a/monitoring/pra/dashboard.json → monitoring/dr/dashboard.json b/monitoring/pra/dashboard.json → monitoring/dr/dashboard.json
diff --git a/monitoring/pra/dashboard.py → monitoring/dr/dashboard.py b/monitoring/pra/dashboard.py → monitoring/dr/dashboard.py
diff --git a/solution/zenkoversion.yaml b/solution/zenkoversion.yaml
@@ -40,7 +40,7 @@ spec:
       image: scuba-dashboards
       tag: '${SCUBA_TAG}'
     dr:
-      image: dr-dashboards
+      image: dr-dashboard
       tag: '${VERSION_FULL}'
   policies:
     backbeat:

diff --git a/tests/ctst/steps/pra.ts b/tests/ctst/steps/pra.ts
@@ -161,7 +161,7 @@ async function waitForPhase(
     return false;
 }
 
-Given('a DR installed', { timeout: 130000 }, async function (this: Zenko) {
+Given('a DR installed', { timeout: 360000 }, async function (this: Zenko) {
     Identity.useIdentity(IdentityEnum.ACCOUNT, Zenko.sites['source'].accountName);
     const credentials = Identity.getCurrentCredentials();
     await createSecret(this, 'drctl-s3-creds', {