github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-02 17:42:18 +00:00
Code Issues Projects Releases Wiki Activity

fix(docker/tester): falco-tester does not have to check for docker/local anymore

Browse Source 
Co-Authored-by: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2020-01-23 12:19:21 +00:00 committed by poiana
parent 347b581d95
commit cf803759ef
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -21,13 +21,13 @@ jobs:
cmake .. cmake ..
popd popd
- run: - run:
name: build name: Build
command: | command: |
pushd build pushd build
make -j4 all make -j4 all
popd popd
- run: - run:
name: run unit tests name: Run unit tests
command: | command: |
pushd build pushd build
make tests make tests

11
docker/tester/root/usr/bin/entrypoint
View File

@ -43,13 +43,10 @@ clean_image() {
case "$CMD" in case "$CMD" in
"test") "test")
if [ ! -d "$BUILD_DIR/$BUILD_TYPE/docker/local" ]; then
echo "Missing $BUILD_DIR/$BUILD_TYPE/docker/local directory." >&2
exit 1
fi
if [ -z "$FALCO_VERSION" ]; then if [ -z "$FALCO_VERSION" ]; then
echo "Automatically figuring out Falco version." echo "Automatically figuring out Falco version."
FALCO_VERSION=$($BUILD_DIR/$BUILD_TYPE/userspace/falco/falco --version | cut -d' ' -f3 | tr -d '\r') FALCO_VERSION=$("$BUILD_DIR/$BUILD_TYPE/userspace/falco/falco" --version | cut -d' ' -f3 | tr -d '\r')
echo "Falco version: $FALCO_VERSION"
fi fi
if [ -z "$FALCO_VERSION" ]; then if [ -z "$FALCO_VERSION" ]; then
echo "Falco version cannot be guessed, please provide it with the FALCO_VERSION environment variable." >&2 echo "Falco version cannot be guessed, please provide it with the FALCO_VERSION environment variable." >&2
@ -60,7 +57,7 @@ case "$CMD" in
build_image "$BUILD_DIR" "$BUILD_TYPE" "$FALCO_VERSION" "deb" build_image "$BUILD_DIR" "$BUILD_TYPE" "$FALCO_VERSION" "deb"
build_image "$BUILD_DIR" "$BUILD_TYPE" "$FALCO_VERSION" "rpm" build_image "$BUILD_DIR" "$BUILD_TYPE" "$FALCO_VERSION" "rpm"
# check that source directory contains Falco and sysdig # check that source directory contains Falco
if [ ! -d "$SOURCE_DIR/falco/test" ]; then if [ ! -d "$SOURCE_DIR/falco/test" ]; then
echo "Missing $SOURCE_DIR/falco/test directory." >&2 echo "Missing $SOURCE_DIR/falco/test directory." >&2
exit 1 exit 1
@ -68,7 +65,7 @@ case "$CMD" in
# run tests # run tests
echo "Running regression tests ..." echo "Running regression tests ..."
cd `$SOURCE_DIR/falco/test` cd "$SOURCE_DIR/falco/test"
./run_regression_tests.sh "$BUILD_DIR/$BUILD_TYPE" ./run_regression_tests.sh "$BUILD_DIR/$BUILD_TYPE"
# clean docker images # clean docker images