From 5a722ae81228bd8f169fdc4f684f89578c48b185 Mon Sep 17 00:00:00 2001 From: Mura Li Date: Sun, 26 May 2019 07:13:01 +0800 Subject: [PATCH] Timeout test commands without complicated tricks (#7020) --- .drone.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 662529bf2..6d9cde5ca 100644 --- a/.drone.yml +++ b/.drone.yml @@ -126,9 +126,8 @@ pipeline: commands: - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - apt-get install -y git-lfs - - (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.sqlite.test)' | sh)) & - - make test-sqlite-migration - - make test-sqlite + - timeout -s ABRT 20m make test-sqlite-migration + - timeout -s ABRT 20m make test-sqlite when: event: [ push, tag, pull_request ] @@ -158,9 +157,8 @@ pipeline: commands: - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - apt-get install -y git-lfs - - (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.test)' | sh)) & - - make test-mysql-migration - - make test-mysql + - timeout -s ABRT 20m make test-mysql-migration + - timeout -s ABRT 20m make test-mysql when: event: [ tag ] @@ -174,9 +172,8 @@ pipeline: commands: - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - apt-get install -y git-lfs - - (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.test)' | sh)) & - - make test-mysql8-migration - - make test-mysql8 + - timeout -s ABRT 20m make test-mysql8-migration + - timeout -s ABRT 20m make test-mysql8 when: event: [ push, tag, pull_request ] @@ -190,9 +187,8 @@ pipeline: commands: - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - apt-get install -y git-lfs - - (sleep 1200 && (echo 'kill -ABRT $(pidof gitea) $(pidof integrations.test)' | sh)) & - - make test-pgsql-migration - - make test-pgsql + - timeout -s ABRT 20m make test-pgsql-migration + - timeout -s ABRT 20m make test-pgsql when: event: [ push, tag, pull_request ]