Skip to content
Snippets Groups Projects
Commit d6a33c68 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

Merge branch 'master' of git.zephyr-software.com:allnp/peasoup_umbrella 

Former-commit-id: ea677eee
parents 0225ca22 155e2914
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 193 additions and 45 deletions
.gitlab-ci.yml
+ 99
− 22
View file @ d6a33c68
before_script:
- "source ~gitlab-runner/cicd_support/cicd_support.shinc"
- "git submodule sync --recursive"
- "git submodule update --recursive --init"
after_script:
- "source ~gitlab-runner/cicd_support/cicd_support.shinc"
- "cicd_cleanup"
xform-ls:
stages:
- clean
- build
- test
#
# Cleaning
#
.do-nightly-clean: &do-nightly-clean
stage: clean
script:
- ./cicd_testing/do-clean.sh
do-nightly-clean-ubuntu18:
<<: *do-nightly-clean
tags:
- ubuntu18
do-nightly-clean-ubuntu16:
<<: *do-nightly-clean
tags:
- ubuntu16
#
# Building
#
.do-build: &do-build
stage: build
script:
- ./cicd_testing/do-build.sh
do-build-ubuntu18:
<<: *do-build
tags:
- psz
- integration
- ubuntu18
do-build-ubuntu16:
<<: *do-build
tags:
- ubuntu16
#
# $PSZ ls
#
.xform-ls: &xform-ls
stage: test
script:
- "# gather info for debugging later, probably not necessary "
- "pwd"
- "hostname"
- "whoami"
- "env|grep CICD"
- ""
- "cd $CICD_TO_TEST_DIR"
- "source set_env_vars"
- "sudo ./get-peasoup-packages.sh all"
- "./build-all.sh --debug"
- "./postgres_setup.sh"
- "cd /tmp"
- "rm -rf ped_ls; $PSZ /bin/ls ./xxx -c rida=on -s meds_static=off --tempdir ped_ls || true"
- "if [[ ! -x ./xxx ]]; then cat ped_ls/logs/*; fi"
- "rm -rf ped_ls"
- "./xxx"
- ./cicd_testing/xform-ls.sh
xform-ls-ubuntu18:
<<: *xform-ls
tags:
- ubuntu18
xform-ls-ubuntu16:
<<: *xform-ls
tags:
- ubuntu16
#
# test_cmds.sh rida
#
.basic-pgms-rida: &basic-pgms-rida
stage: test
script:
- ./cicd_testing/basic-pgms-rida.sh
basic-pgms-rida-ubuntu18:
<<: *basic-pgms-rida
tags:
- ubuntu18
basic-pgms-rida-ubuntu16:
<<: *basic-pgms-rida
tags:
- ubuntu16
#
# test_cmds.sh rida-p1
#
.basic-pgms-rida-p1: &basic-pgms-rida-p1
stage: test
script:
- ./cicd_testing/basic-pgms-rida-p1.sh
basic-pgms-rida-p1-ubuntu18:
<<: *basic-pgms-rida-p1
tags:
- ubuntu18
basic-pgms-rida-p1-ubuntu16:
<<: *basic-pgms-rida-p1
tags:
- ubuntu16
SMPStaticAnalyzer @ 2aa2a42b
Compare 26d75307...2aa2a42b
Subproject commit 26d753078ed67a95a294557f0ecc8cc474985eca
Subproject commit 2aa2a42b1b002fa36484b3e921b1849c0a53ff90
build-all.sh
+ 19
− 19
View file @ d6a33c68
......@@ -39,7 +39,7 @@ use_strata=0
if [[ $use_strata = 1 ]]; then
# stratafier
cd $PEASOUP_UMBRELLA_DIR/stratafier
make || exit
make || exit 1
# strata
if [ ! "$STRATA_HOME" ]; then
......@@ -60,20 +60,20 @@ if [[ $use_strata = 1 ]]; then
fi
cd $STRATA_HOME32
STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit
STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit 1
# build x86-64 strata
cd $STRATA_HOME
if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then
echo Skipping Strata reconfigure step
else
./configure $cfar_mode || exit
./configure $cfar_mode || exit 1
fi
make || exit
make || exit 1
else
cd $STRATA_HOME
./build $cfar_mode || exit
./build $cfar_mode || exit 1
fi
fi
......@@ -90,56 +90,56 @@ if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
fi
cd $SECURITY_TRANSFORMS_HOME
scons $SCONSDEBUG -j 3 || exit
scons $SCONSDEBUG -j 3 || exit 1
cd $SMPSA_HOME
scons $SCONSDEBUG -j 3 || exit
scons $SCONSDEBUG -j 3 || exit 1
cd $PEASOUP_HOME
make || exit
make || exit 1
if [ -d $ZIPR_CALLBACKS ]; then
cd $ZIPR_CALLBACKS
./configure --enable-p1 --prefix=$ZIPR_INSTALL
make || exit
make install || exit
make || exit 1
make install || exit 1
fi
if [ -d $ZIPR_HOME ]; then
cd $ZIPR_HOME
scons $SCONSDEBUG -j 3|| exit
scons $SCONSDEBUG -j 3|| exit 1
fi
if [ -d $ZIPR_SCFI_PLUGIN ]; then
cd $ZIPR_SCFI_PLUGIN
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
fi
cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin ]] ; then
cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
fi
if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin ]] ; then
cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
fi
cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
cd $PEASOUP_UMBRELLA_DIR/zipr_unpin_plugin
scons $SCONSDEBUG || exit
scons $SCONSDEBUG || exit 1
cd $IRDB_TRANSFORMS
scons $SCONSDEBUG -j 3 || exit
scons $SCONSDEBUG -j 3 || exit 1
if [[ -d $DAFFY_HOME ]] && [[ $(uname -p) == 'x86_64' ]]; then
cd $DAFFY_HOME
./setup_cfar.sh
./setup_cfar.sh || exit 1
fi
cd $PEASOUP_UMBRELLA_DIR
......
cicd_testing/basic-pgms-rida-p1.sh 0 → 100755
+ 9
− 0
View file @ d6a33c68
#/bin/bash
set -e
set -x
cd /tmp/peasoup_test
source set_env_vars
cd $CICD_TO_TEST_DIR/peasoup_examples/tests
cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida_p1
cicd_testing/basic-pgms-rida.sh 0 → 100755
+ 9
− 0
View file @ d6a33c68
#!/bin/bash
set -e
set -x
cd /tmp/peasoup_test
source set_env_vars
cd $CICD_TO_TEST_DIR/peasoup_examples/tests
cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida
cicd_testing/do-build.sh 0 → 100755
+ 21
− 0
View file @ d6a33c68
#!/bin/bash
set -e
set -x
# update submodules
git submodule sync --recursive
git submodule update --recursive --init
# gather info for debugging later, probably not necessary
pwd
hostname
whoami
env|grep CICD
time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/peasoup_test
cd /tmp/peasoup_test
source set_env_vars
sudo ./get-peasoup-packages.sh all
./build-all.sh
./postgres_setup.sh
cicd_testing/do-clean.sh 0 → 100755
+ 20
− 0
View file @ d6a33c68
#!/bin/bash
set -e
set -x
main()
{
if [[ $CICD_NIGHTLY == 1 ]] ; then
# gather info for debugging later, probably not necessary
pwd
hostname
whoami
env|grep CICD
rm -rf /tmp/peasoup_test
fi
}
main "$@"
cicd_testing/xform-ls.sh 0 → 100755
+ 12
− 0
View file @ d6a33c68
#!/bin/bash
set -e
set -x
cd /tmp/peasoup_test
source set_env_vars
cd /tmp
rm -rf xxx ped_ls; $PSZ /bin/ls ./xxx -c rida=on -s meds_static=off --tempdir ped_ls || true
if [[ ! -x ./xxx ]]; then cat ped_ls/logs/*; fi
rm -rf ped_ls
./xxx
peasoup_examples @ cdaa88dd
Compare 3de8b74d...cdaa88dd
Subproject commit 3de8b74db1a493144f5c771693c15fb4871b8d06
Subproject commit cdaa88dd81a8a9c91bbe13b767d149c9bfd07cf1
security_transforms @ 5dbce69e
Compare ac9f9dc7...5dbce69e
Subproject commit ac9f9dc7af8938c6f1f41f849221956cfd5237e7
Subproject commit 5dbce69e8e12ffe5f965514b0f15f04dfa8fef2f
zipr @ 7fe51a50
Compare f1b6a510...7fe51a50
Subproject commit f1b6a510d9ff2dad49d5003da9cf0fc85e97ada0
Subproject commit 7fe51a50552503862d70845e789b5461c3f61b19
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