diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh index 2ea87c4665ef4cbab4078f18f408c32443c7b790..0490428652999ca75fbc80c9e794871f731d0aa3 100755 --- a/cicd_tests/do-build.sh +++ b/cicd_tests/do-build.sh @@ -15,14 +15,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 zipr_umbrella # puts the version of zipr to test in peasoup_umbrella/zipr. - cicd_put_module_in_tree peasoup_umbrella/zipr + cicd_put_module_in_tree zipr_umbrella/zipr # Build/run $PSZ, test result - cd $CICD_MODULE_WORK_DIR/peasoup_umbrella + cd $CICD_MODULE_WORK_DIR/zipr_umbrella source set_env_vars sudo ./get-peasoup-packages.sh all ./build-all.sh diff --git a/cicd_tests/do-clean.sh b/cicd_tests/do-clean.sh index 95dc3b04bd7eed3a1c9bd554fcf9ffbe047547b8..f6b44214bd1f94648ce175dba52c2693eccc3777 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/zipr_umbrella fi } diff --git a/cicd_tests/internal-tests.sh b/cicd_tests/internal-tests.sh index 7d4c8ee050d6e1d7557957eb2555874154c3b645..b8995514f4813cace48421456c664f3a03f46df7 100755 --- a/cicd_tests/internal-tests.sh +++ b/cicd_tests/internal-tests.sh @@ -3,7 +3,7 @@ set -e set -x -cd $CICD_MODULE_WORK_DIR/peasoup_umbrella +cd $CICD_MODULE_WORK_DIR/zipr_umbrella source set_env_vars # run zipr internal tests cd $ZIPR_HOME/test; scons diff --git a/cicd_tests/xform-cat.sh b/cicd_tests/xform-cat.sh index af86bf8e4498ad6dea605d247760350fa8a526ad..9e976892d8c1b5f910e8e2bec82af915e410114c 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/zipr_umbrella set -e set -x diff --git a/cicd_tests/xform-ls.sh b/cicd_tests/xform-ls.sh index 8a37160ea7a35466a4c29ce0b60518e36eb02ef0..9b94ebf39ae5b4dd2ca0b93c5bb570d730770abf 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/zipr_umbrella source set_env_vars cd /tmp rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true