3 files changed, 15 insertions, 15 deletions
diff --git a/ca/tests/smoketest.1.yaml b/ca/tests/smoketest.1.yaml
index 0e9acb85..edcf42a9 100644
--- a/ca/tests/smoketest.1.yaml
+++ b/ca/tests/smoketest.1.yaml
@@ -52,9 +52,9 @@ kids:
 
 ---
 - shell set -x;
-  rtr_origin='../../../rp/rpki-rtr/rtr-origin';
-  $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated &&
-  $rtr_origin --show
+  rpki_rtr='../../../rp/rpki-rtr/rpki-rtr';
+  $rpki_rtr cronjob rcynic-data/authenticated &&
+  $rpki_rtr show
 ---
 - name: R0
   rekey:
@@ -70,9 +70,9 @@ kids:
       ipv4: 10.3.0.1/32, 10.0.0.44/32
 ---
 - shell set -x;
-  rtr_origin='../../../rp/rpki-rtr/rtr-origin';
-  $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated &&
-  $rtr_origin --show
+  rpki_rtr='../../../rp/rpki-rtr/rpki-rtr';
+  $rpki_rtr cronjob rcynic-data/authenticated &&
+  $rpki_rtr show
 ---
 - sleep 30
 ---
diff --git a/ca/tests/smoketest.3.yaml b/ca/tests/smoketest.3.yaml
index df308ebe..557ebeeb 100644
--- a/ca/tests/smoketest.3.yaml
+++ b/ca/tests/smoketest.3.yaml
@@ -61,9 +61,9 @@ kids:
 #        -print -exec ../../../rp/utils/print_manifest {} \;
 #---
 - shell set -x;
-  rtr_origin=../../../rp/rpki-rtr/rtr-origin;
-  $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated &&
-  $rtr_origin --show
+  rpki_rtr=../../../rp/rpki-rtr/rpki-rtr;
+  $rpki_rtr cronjob rcynic-data/authenticated &&
+  $rpki_rtr show
 ---
 - name: Alice
   roa_request_del:
@@ -76,6 +76,6 @@ kids:
       ipv6: 2002:0a00::/32-128
 ---
 - shell set -x;
-  rtr_origin=../../../rp/rpki-rtr/rtr-origin;
-  $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated &&
-  $rtr_origin --show
+  rpki_rtr=../../../rp/rpki-rtr/rpki-rtr;
+  $rpki_rtr cronjob rcynic-data/authenticated &&
+  $rpki_rtr show
diff --git a/ca/tests/smoketest.7.yaml b/ca/tests/smoketest.7.yaml
index 2da48770..818637f7 100644
--- a/ca/tests/smoketest.7.yaml
+++ b/ca/tests/smoketest.7.yaml
@@ -72,6 +72,6 @@ roa_request:
   find publication -type f -name '*.roa'
        -print -exec ../../../rp/utils/print_roa {} \;
        ;
-  rtr_origin=../../../rp/rpki-rtr/rtr-origin;
-  $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated &&
-  $rtr_origin --show
+  rpki_rtr=../../../rp/rpki-rtr/rpki-rtr;
+  $rpki_rtr cronjob rcynic-data/authenticated &&
+  $rpki_rtr show