diff --git a/cicd_tests/basic-pgms-orig.sh b/cicd_tests/basic-pgms-orig.sh index 4d0b89cb22ecf0a78abbe740e4b0598456c34604..c6a3170cf5b600ca7ff3dc430d1b9c837921eadb 100755 --- a/cicd_tests/basic-pgms-orig.sh +++ b/cicd_tests/basic-pgms-orig.sh @@ -2,7 +2,7 @@ set -e set -x -cd $CICD_MODULE_WORK_DIR/peasoup_umbrella +cd $CICD_MODULE_WORK_DIR/ps_pe_umbrella source set_env_vars # internal tests that do not require transforming binaries diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh index 2a6b0a8ecfea99d05918051f94d9ba8fad30a7ef..a25af4cdd1f00d7fcd0aad1b5851cebad14e7b3d 100755 --- a/cicd_tests/do-build.sh +++ b/cicd_tests/do-build.sh @@ -18,14 +18,14 @@ main() local orig_dir=$(pwd) # puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR - cicd_setup_module_dependency allnp/peasoup_umbrella.git + cicd_setup_module_dependency allnp/peasoup_umbrella.git ps_pe_umbrella - # puts the version of peasoup_examples to test in peasoup_umbrella/peasoup_examples - cicd_put_module_in_tree peasoup_umbrella/peasoup_examples + # puts the version of peasoup_examples to test in ps_pe_umbrella/peasoup_examples + cicd_put_module_in_tree ps_pe_umbrella/peasoup_examples # Build/run $PSZ, test result - cd $CICD_MODULE_WORK_DIR/peasoup_umbrella + cd $CICD_MODULE_WORK_DIR/ps_pe_umbrella source set_env_vars sudo ./get-peasoup-packages.sh all diff --git a/cicd_tests/do-clean.sh b/cicd_tests/do-clean.sh index 95dc3b04bd7eed3a1c9bd554fcf9ffbe047547b8..06febc8bf388e5cf5c181ce4780cbeedb9da56d0 100755 --- a/cicd_tests/do-clean.sh +++ b/cicd_tests/do-clean.sh @@ -14,7 +14,7 @@ main() if [[ $CICD_NIGHTLY == 1 ]] ; then - rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella + rm -rf $CICD_MODULE_WORK_DIR/ps_pe_umbrella fi } diff --git a/cicd_tests/verify-fails.sh b/cicd_tests/verify-fails.sh index a6cae1e3ec820d4e24a9d350b1a4a03e99f2d595..1196ac5463ff3d8d262db6c93865483d9662e4c0 100755 --- a/cicd_tests/verify-fails.sh +++ b/cicd_tests/verify-fails.sh @@ -2,7 +2,7 @@ set -e set -x -cd $CICD_MODULE_WORK_DIR/peasoup_umbrella +cd $CICD_MODULE_WORK_DIR/ps_pe_umbrella source set_env_vars cd $PEASOUP_HOME/tests diff --git a/cicd_tests/xform-cat.sh b/cicd_tests/xform-cat.sh index 56d53520b8cea4bae4fe5557fe2dd9e30fd26a44..5afbcb8cce0143b5d7c5954f0472cec7b2778493 100755 --- a/cicd_tests/xform-cat.sh +++ b/cicd_tests/xform-cat.sh @@ -1,4 +1,4 @@ -cd $CICD_MODULE_WORK_DIR/peasoup_umbrella +cd $CICD_MODULE_WORK_DIR/ps_pe_umbrella set -e set -x diff --git a/cicd_tests/xform-ls.sh b/cicd_tests/xform-ls.sh index 748f01c5f7cfeccdfa80392420671a6bbde2c17c..41d6fb8d732ae4b3eeb01d24a8f4968724125141 100755 --- a/cicd_tests/xform-ls.sh +++ b/cicd_tests/xform-ls.sh @@ -2,7 +2,7 @@ set -e set -x -cd $CICD_MODULE_WORK_DIR/peasoup_umbrella +cd $CICD_MODULE_WORK_DIR/ps_pe_umbrella source set_env_vars cd /tmp rm -rf ls.rida ped_ls