diff --git a/.travis.yml b/.travis.yml index 6b8992f95e..181262e0d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_install: - "ci/setup.sh" - "ci/install_go.sh" - "ci/install_rust.sh" + - "ci/install_vc.sh" - "ci/static-checks.sh" # need to install rust from scratch? @@ -27,7 +28,9 @@ before_install: # which is already installed? install: + - cd ${TRAVIS_BUILD_DIR}/src/runtime && make - cd ${TRAVIS_BUILD_DIR}/src/agent && make script: + - cd ${TRAVIS_BUILD_DIR}/src/runtime && make test - cd ${TRAVIS_BUILD_DIR}/src/agent && make check diff --git a/ci/install_vc.sh b/ci/install_vc.sh new file mode 100755 index 0000000000..67968699bf --- /dev/null +++ b/ci/install_vc.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Copyright (c) 2018 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +set -e + +cidir=$(dirname "$0") +vcdir="${cidir}/../src/runtime/virtcontainers/" +source "${cidir}/lib.sh" +export CI_JOB="${CI_JOB:-default}" + +clone_tests_repo + +if [ "${CI_JOB}" != "PODMAN" ]; then + echo "Install virtcontainers" + make -C "${vcdir}" && chronic sudo make -C "${vcdir}" install +fi diff --git a/ci/lib.sh b/ci/lib.sh index 3aa9c5c30e..76734f1f55 100644 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -16,10 +16,6 @@ clone_tests_repo() fi go get -d -u "$tests_repo" || true - - if [ -n "${TRAVIS_BRANCH:-}" ]; then - ( cd "${tests_repo_dir}" && git checkout "${TRAVIS_BRANCH}" ) - fi } run_static_checks()