Commit 0921d90e authored by Jason Hiser's avatar Jason Hiser 🚜

cleaned up testing

parent a3021b69
Pipeline #2611 passed with stages
in 6 minutes and 28 seconds
......@@ -2,21 +2,23 @@
set -e
set -x
orig_dir=$(pwd)
main()
{
# set env vars.
cd $CICD_MODULE_WORK_DIR/cookbook_test
source set_env_vars
cd /tmp/cookbook_tmp
source set_env_vars
local orig_dir=$(pwd)
echo 'The plugins are:'
ls $(echo $PSPATH|sed "s/:/ /g")
# set env vars.
cd $CICD_MODULE_WORK_DIR/cookbook_test
source set_env_vars
cd /tmp/cookbook_tmp
source set_env_vars
# run tests
cd $PEASOUP_HOME/tests
make clean;
./test_cmds.sh -c kill_deads_rida -l -a "tcpdump"
./test_cmds.sh -c kill_deads -l -a "bzip2"
# run tests
cd $PEASOUP_HOME/tests
make clean;
./test_cmds.sh -c kill_deads_rida -l -a "tcpdump"
./test_cmds.sh -c kill_deads -l -a "bzip2"
}
main "$@"
......@@ -5,6 +5,7 @@ set -x
main()
{
local orig_dir=$(pwd)
# gather info for debugging later, probably not necessary
pwd
......@@ -12,14 +13,14 @@ main()
whoami
env|grep "^CICD"
# sync submodules
git submodule sync
git submodule update --init --recursive
time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/cookbook_tmp
# rsync with /tmp for caching. this is a very fast copy operation.
time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/cookbook_tmp
local orig_dir=$(pwd)
# puts cookbook_test (and all submodules) in CICD_MODULE_WORK_DIR
# puts ps_zipr (and all submodules) in CICD_MODULE_WORK_DIR
cicd_setup_module_dependency allnp/peasoup_umbrella.git cookbook_test
# Build/run $PSZ, test result
......@@ -28,19 +29,19 @@ main()
sudo ./get-peasoup-packages.sh all
# remove pedi files so that rebuilding includes re-doing pedi setup.
# this is quick enough that we can do it on every test.
$PEDI_HOME/pedi -c -m manifest.txt || true # ignore errors in cleanup
./build-all.sh
dropdb $PGDATABASE 2>/dev/null || true
dropdb $PGDATABASE 2>/dev/null || true # ignore errors in DB cleanup
# make sure postgres is clean/setup
./postgres_setup.sh
# build the cookbook
cd /tmp/cookbook_tmp
source set_env_vars
scons -j 3
echo 'The plugins are:'
ls $(echo $PSPATH|sed "s/:/ /g")
}
main "$@"
......
......@@ -12,6 +12,7 @@ main()
whoami
env|grep CICD
# remove the cache
rm -rf $CICD_MODULE_WORK_DIR/cookbook_test /tmp/cookbook_tmp
fi
}
......
......@@ -2,10 +2,19 @@
set -e
set -x
cd $CICD_MODULE_WORK_DIR/cookbook_test
source set_env_vars
cd /tmp/cookbook_tmp
source set_env_vars
cd $PEASOUP_HOME/examples/cpp-examples
./test_quick.sh
main()
{
# setup env
cd $CICD_MODULE_WORK_DIR/cookbook_test
source set_env_vars
cd /tmp/cookbook_tmp
source set_env_vars
# run the cpp EH tests
cd $PEASOUP_HOME/examples/cpp-examples
./test_quick.sh
}
main "$@"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment