Merge pull request #396 from karelyatin/kuttl-script-path

[kuttl] Use relative path to scripts
openstack-k8s-operators · Jan 16, 2025 · 01bee47 · 01bee47
2 parents 560140f + 63c84c1
commit 01bee47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/tests/kuttl/tests/ovn_db_delete/03-assert.yaml b/tests/kuttl/tests/ovn_db_delete/03-assert.yaml
@@ -2,6 +2,6 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 commands:
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh nb 3
+      ../../common/scripts/check_cluster_status.sh nb 3
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh sb 3
+      ../../common/scripts/check_cluster_status.sh sb 3
diff --git a/tests/kuttl/tests/ovn_db_delete/09-assert.yaml b/tests/kuttl/tests/ovn_db_delete/09-assert.yaml
@@ -2,6 +2,6 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 commands:
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh nb 1
+      ../../common/scripts/check_cluster_status.sh nb 1
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh sb 1
+      ../../common/scripts/check_cluster_status.sh sb 1
diff --git a/tests/kuttl/tests/ovn_tls_enable/01-assert.yaml b/tests/kuttl/tests/ovn_tls_enable/01-assert.yaml
@@ -34,6 +34,6 @@ commands:
       oc rsh -n $NAMESPACE ${sb_pod} ovn-sbctl --no-leader-only  get-connection | grep -q ptcp
   # Check we have 3 servers using tcp
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh nb 3
+      ../../common/scripts/check_cluster_status.sh nb 3
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh sb 3
+      ../../common/scripts/check_cluster_status.sh sb 3
diff --git a/tests/kuttl/tests/ovn_tls_enable/02-assert.yaml b/tests/kuttl/tests/ovn_tls_enable/02-assert.yaml
@@ -34,6 +34,6 @@ commands:
       oc rsh -n $NAMESPACE ${sb_pod} ovn-sbctl --no-leader-only  get-connection | grep -q pssl
   # Check we have 3 servers using ssl
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh nb 3 ssl
+      ../../common/scripts/check_cluster_status.sh nb 3 ssl
   - script: |
-      $OVN_KUTTL_DIR/../common/scripts/check_cluster_status.sh sb 3 ssl
+      ../../common/scripts/check_cluster_status.sh sb 3 ssl