diff --git a/.travis.yml b/.travis.yml index f136011b..c7795e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: - pushd ../sysdig && (git checkout "${BRANCH}" || exit 0) && echo "Using sysdig branch:" $(git rev-parse --abbrev-ref HEAD) && popd script: - mkdir build - - ./hack/build.sh "${TRAVIS_BUILD_DIR}/.." "${TRAVIS_BUILD_DIR}/build" "falcosecurity/falco-builder:chore-travis" + - ./hack/build.sh "${TRAVIS_BUILD_DIR}/.." "${TRAVIS_BUILD_DIR}/build" notifications: webhooks: urls: diff --git a/hack/build.sh b/hack/build.sh index 28f38eec..6c3f55cd 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -4,10 +4,25 @@ set -xeuo pipefail SOURCE_DIR=$1 BUILD_DIR=$2 -FALCOBUILDER_IMAGE=$3 +FALCOBUILDER_IMAGE="falcosecurity/falco-builder:chore-travis" +FALCOTESTER_IMAGE="falcosecurity/falco-tester:chore-travis" docker run --user "$(id -u)":"$(id -g)" -v /etc/passwd:/etc/passwd:ro -e BUILD_TYPE="$BUILD_TYPE" -v "$SOURCE_DIR":/source -v "$BUILD_DIR":/build "$FALCOBUILDER_IMAGE" cmake docker run --user "$(id -u)":"$(id -g)" -v /etc/passwd:/etc/passwd:ro -e BUILD_TYPE="$BUILD_TYPE" -v "$SOURCE_DIR":/source -v "$BUILD_DIR":/build "$FALCOBUILDER_IMAGE" package docker run --user "$(id -u)":"$(id -g)" -v /etc/passwd:/etc/passwd:ro -e BUILD_TYPE="$BUILD_TYPE" -v "$SOURCE_DIR":/source -v "$BUILD_DIR":/build "$FALCOBUILDER_IMAGE" tests -docker run -v /boot:/boot:ro -v /var/run/docker.sock:/var/run/docker.sock -v /etc/passwd:/etc/passwd:ro -e BUILD_TYPE="$BUILD_TYPE" -v "$SOURCE_DIR":/source -v "$BUILD_DIR":/build falcosecurity/falco-tester +# Deduct currently built version +CURRENT_FALCO_VERSION=$(docker run -v "$BUILD_DIR":/build -ti "$FALCOBUILDER_IMAGE" bash -c "./build/$BUILD_TYPE/userspace/falco/falco --version" | cut -d' ' -f3) +# CURRENT_FALCO_VERSION="${CURRENT_FALCO_VERSION#"${CURRENT_FALCO_VERSION%%[![:space:]]*}"}" +# CURRENT_FALCO_VERSION="${CURRENT_FALCO_VERSION%"${CURRENT_FALCO_VERSION##*[![:space:]]}"}" + +# Execute regression tests +docker run \ + -v /boot:/boot:ro \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v /etc/passwd:/etc/passwd:ro \ + -v "$SOURCE_DIR":/source \ + -v "$BUILD_DIR":/build \ + -e BUILD_TYPE="$BUILD_TYPE" \ + -e FALCO_VERSION="$CURRENT_FALCO_VERSION" \ + "$FALCOTESTER_IMAGE" \ No newline at end of file