summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMura Li <typeless@users.noreply.github.com>2019-05-26 07:13:01 +0800
committerzeripath <art27@cantab.net>2019-05-26 00:13:01 +0100
commit5a722ae81228bd8f169fdc4f684f89578c48b185 (patch)
tree0799032f3d2bd00d2d22bd1681aeafa74b210f15
parentdaaae2aad5b63f916826ef602c8347b6fd1e2372 (diff)
downloadgitea-5a722ae81228bd8f169fdc4f684f89578c48b185.tar.gz
gitea-5a722ae81228bd8f169fdc4f684f89578c48b185.zip
Timeout test commands without complicated tricks (#7020)
-rw-r--r--.drone.yml20
1 files changed, 8 insertions, 12 deletions
diff --git a/.drone.yml b/.drone.yml
index 662529bf2e..6d9cde5ca9 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 ]