From 1938139dd1d6a90c34faf293b73747af1ac071f1 Mon Sep 17 00:00:00 2001
From: Mikhail Titov <mikhail.a.titov@gmail.com>
Date: Mon, 28 Aug 2023 21:27:04 -0400
Subject: [PATCH] ci-rp: fixed RP tests

---
 ci/tests/rp-flux/test.sh | 14 ++++++--------
 ci/tests/rp/test.sh      | 22 +++-------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/ci/tests/rp-flux/test.sh b/ci/tests/rp-flux/test.sh
index ab202f8e..40554f16 100755
--- a/ci/tests/rp-flux/test.sh
+++ b/ci/tests/rp-flux/test.sh
@@ -16,19 +16,17 @@ mkdir -p .radical/pilot/configs
 cp ci/tests/rp-flux/resource_flux.json .radical/pilot/configs/resource_flux.json
 export RADICAL_CONFIG_USER_DIR=$(pwd)
 
-if [[ ! -d "./radical.pilot" ]]; then
-    git clone -b v$rp_version --single-branch \
-    https://github.com/radical-cybertools/radical.pilot.git
-fi
-cd radical.pilot
+wget "https://raw.githubusercontent.com/radical-cybertools/radical.pilot/v$rp_version/examples/00_getting_started.py"
 
-echo '--- smoke test'
-./examples/00_getting_started.py 'flux.localhost_flux'
+radical-stack
+./00_getting_started.py 'flux.localhost_flux'
 ret=$?
 echo "--- smoke test $ret"
 
-rm -rf $HOME/radical.pilot.sandbox/*
+SID=$(ls -rt | grep rp.session)
+test -z "$SID" || rm -rf "$HOME/radical.pilot.sandbox/$SID"
 echo '--- cleaned pilot sandbox'
 
 test "$ret" = 0 && echo "Success!"
 exit $ret
+
diff --git a/ci/tests/rp/test.sh b/ci/tests/rp/test.sh
index 59e074fe..df107de4 100755
--- a/ci/tests/rp/test.sh
+++ b/ci/tests/rp/test.sh
@@ -22,31 +22,15 @@ cat > .radical/pilot/configs/resource_local.json <<EOF
 EOF
 export RADICAL_CONFIG_USER_DIR=$(pwd)
 
-if [[ ! -d "./radical.pilot" ]]; then
-    git clone -b v$rp_version --single-branch \
-    https://github.com/radical-cybertools/radical.pilot.git
-fi
-cd radical.pilot
+wget "https://raw.githubusercontent.com/radical-cybertools/radical.pilot/v$rp_version/examples/00_getting_started.py"
 
-echo '--- smoke test'
-./examples/00_getting_started.py local.localhost
+radical-stack
+./00_getting_started.py local.localhost
 ret=$?
 echo "--- smoke test $ret"
 
 SID=$(ls -rt | grep rp.session)
 test -z "$SID" || rm -rf "$HOME/radical.pilot.sandbox/$SID"
-
-echo '--- unit test'
-pytest -vvv tests/unit_tests
-test "$ret" = 0 && ret=$?
-echo "--- unit test $ret"
-
-echo '--- component test'
-pytest -vvv tests/component_tests
-test "$ret" = 0 && ret=$?
-echo "--- component test $ret"
-
-rm -rf $HOME/radical.pilot.sandbox/*
 echo '--- cleaned pilot sandbox'
 
 test "$ret" = 0 && echo "Success!"