Change output to outputformat as param changed in drctl

.github/workflows/end2end.yaml

@@ -487,6 +487,14 @@ jobs:
       - name: Configure E2E CTST test environment
         run: bash configure-e2e-ctst.sh
         working-directory: ./.github/scripts/end2end
+      - name: "Debug: SSH to runner"
+        uses: scality/actions/[email protected]
+        with:
+          tmate-server-host: ${{ secrets.TMATE_SERVER_HOST }}
+          tmate-server-port: ${{ secrets.TMATE_SERVER_PORT }}
+          tmate-server-rsa-fingerprint: ${{ secrets.TMATE_SERVER_RSA_FINGERPRINT }}
+          tmate-server-ed25519-fingerprint: ${{ secrets.TMATE_SERVER_ED25519_FINGERPRINT }}
+        timeout-minutes: 30
       - name: Run CTST end to end tests
         run: bash run-e2e-ctst.sh "" "" "" "" --tags @PRA
         working-directory: ./.github/scripts/end2end

solution/deps.yaml

@@ -21,7 +21,7 @@ cloudserver:
 drctl:
   sourceRegistry: ghcr.io/scality
   image: zenko-drctl
-  tag: v1.0.4
+  tag: e43bce2bfddd5c667e1488c2a2fa846da53c8c07
   envsubst: DRCTL_TAG
   toolName: zenko-drctl
 fubectl:

tests/ctst/steps/dr/drctl.ts

@@ -148,6 +148,7 @@ type StatusConfig = {
     sourceZenkoDrInstance?: string;
     sinkZenkoDrInstance?: string;
     output?: string;
+    outputFormat?: string;
 };
 
 type ReplicationPauseConfig = {

tests/ctst/steps/pra.ts

@@ -110,15 +110,14 @@ async function waitForPhase(
             sourceZenkoNamespace: 'default',
             sinkZenkoDrInstance: 'end2end-pra-sink',
             sourceZenkoDrInstance: 'end2end-source',
-            output: 'json',
+            outputFormat: 'json',
         });
 
         if (!currentStatus) {
-            world.logger.debug('Failed to get DR status, retrying', {
+            world.logger.debug('Failed to get DR status', {
                 currentStatus,
             });
-            await Utils.sleep(1000);
-            continue;
+            throw new Error('Failed to get DR status');
         }
 
         const lines = currentStatus.split('\n');
@@ -217,7 +216,8 @@ Then('the DR sink should be in phase {string}', { timeout: 360000 }, async funct
         throw new Error(`Unknown state ${state}`);
     }
 
-    await waitForPhase(this, 'sink', targetPhase);
+    const res = await waitForPhase(this, 'sink', targetPhase);
+    assert(res);
 });
 
 Then('the DR source should be in phase {string}', { timeout: 360000 }, async function (this: Zenko, state: string) {
@@ -245,7 +245,8 @@ Then('the DR source should be in phase {string}', { timeout: 360000 }, async fun
         throw new Error(`Unknown state ${state}`);
     }
 
-    await waitForPhase(this, 'source', targetPhase);
+    const res = await waitForPhase(this, 'source', targetPhase);
+    assert(res);
 });
 
 Then('object {string} should {string} be {string} and have the storage class {string} on {string} site',