Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (1)
...@@ -15,14 +15,14 @@ main() ...@@ -15,14 +15,14 @@ main()
local orig_dir=$(pwd) local orig_dir=$(pwd)
# puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR # 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. # 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 # Build/run $PSZ, test result
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars source set_env_vars
sudo ./get-peasoup-packages.sh all sudo ./get-peasoup-packages.sh all
./build-all.sh ./build-all.sh
......
...@@ -14,7 +14,7 @@ main() ...@@ -14,7 +14,7 @@ main()
if [[ $CICD_NIGHTLY == 1 ]] ; then if [[ $CICD_NIGHTLY == 1 ]] ; then
rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella rm -rf $CICD_MODULE_WORK_DIR/zipr_umbrella
fi fi
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -e set -e
set -x set -x
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars source set_env_vars
# run zipr internal tests # run zipr internal tests
cd $ZIPR_HOME/test; scons cd $ZIPR_HOME/test; scons
......
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella cd $CICD_MODULE_WORK_DIR/zipr_umbrella
set -e set -e
set -x set -x
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -e set -e
set -x set -x
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars source set_env_vars
cd /tmp cd /tmp
rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true
......