From 45d4e5fb625f877c237898b89ce9929b72e9acb0 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Fri, 26 Jan 2018 11:04:57 -0600 Subject: [PATCH] travis: Wait more than 10 min Use travis configuration to wait more than 10 min Signed-off-by: Jose Carlos Venegas Munoz --- .travis.yml | 2 +- rootfs-builder/rootfs.sh | 2 -- tests/image_creation.bats | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b81698ebe..303d4c4a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ before_script: - ".ci/setup.sh" script: -- ".ci/run.sh" +- "travis_wait .ci/run.sh" diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh index b8ab4473c..0175d7294 100755 --- a/rootfs-builder/rootfs.sh +++ b/rootfs-builder/rootfs.sh @@ -96,12 +96,10 @@ ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin [ -d "${dir}" ] || die "${dir}: not a directory" pushd ${dir} [ -f "${dockerfile_template}" ] || die "${dockerfile_template}: file not found" - set -x sed \ -e "s|@OS_VERSION@|${OS_VERSION}|g" \ -e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \ ${dockerfile_template} > Dockerfile - set +x popd } diff --git a/tests/image_creation.bats b/tests/image_creation.bats index e018ea15a..0261fd993 100644 --- a/tests/image_creation.bats +++ b/tests/image_creation.bats @@ -45,9 +45,5 @@ function build_image() } @test "Can create euleros image" { - if [ "$TRAVIS" = true ] - then - skip "travis timout, see: https://github.com/kata-containers/osbuilder/issues/46" - fi build_image euleros }