Merge branch 'RamenDR:main' into main

.github/workflows/ci.yaml

@@ -314,7 +314,7 @@ jobs:
           ${{env.DOCKERCMD}} load -i /tmp/ramen-operator.tar
 
       - name: Login to Quay
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}

test/addons/volsync/test

@@ -110,7 +110,7 @@ def run_replication(cluster):
         "replicationsource/busybox-src",
         output="jsonpath={.status.lastManualSync}",
         namespace=NAMESPACE,
-        timeout=60,
+        timeout=120,
         profile=cluster,
     )
 

test/drenv/__init__.py

@@ -24,11 +24,11 @@ def wait_for(
     using `kubectl wait`.
 
     To wait for a specific part of the resource specify a kubectl output
-    specficiation (e.g. output="jsonpath={.status.phase}"). The function
+    specification (e.g. output="jsonpath={.status.phase}"). The function
     returns when the output is non empty.
 
     Returns the resource .metadata.name, or if output was specified, the
-    specified outpout for the resource.
+    specified output for the resource.
 
     Raises RuntimeError if the resource does not exist within the specified
     timeout.
@@ -45,18 +45,21 @@ def wait_for(
         out = kubectl.get(*args, context=profile)
         if out:
             elapsed = time.monotonic() - start
-            log(f"{resource} outuput={output} found in {elapsed:.2f} seconds")
+            log(f"{resource!r} output={output!r} found in {elapsed:.2f} seconds")
             return out
 
         if time.monotonic() > deadline:
-            raise RuntimeError(f"Timeout waiting for {resource}")
+            raise RuntimeError(
+                f"Timeout waiting for {resource!r} output={output!r} "
+                f"namespace={namespace!r} profile={profile!r} timeout={timeout}"
+            )
 
         time.sleep(delay)
 
 
 def template(path):
     """
-    Retrun a string.Template with contents of path.
+    Return a string.Template with contents of path.
     """
     with open(path) as f:
         return string.Template(f.read())