JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jenkins: increase timeouts, so master has time to complete (#3096)

Browse Source
This commit is contained in:
Egon Elbre 2019-09-20 17:44:43 +03:00 committed by GitHub
parent 68d281db44
commit ddfcbfcd31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.jenkins
View File

@ -39,6 +39,6 @@ RUN go get github.com/mfridman/tparse
RUN go get github.com/axw/gocov/gocov
RUN go get github.com/AlekSi/gocov-xml
# Set our entrypoint to close after 18 minutes, and forcefully close at 20 minutes.
# Set our entrypoint to close after 28 minutes, and forcefully close at 30 minutes.
# This is to prevent Jenkins collecting cats.
ENTRYPOINT ["timeout", "-k20m", "18m"]
ENTRYPOINT ["timeout", "-k30m", "28m"]

4
Jenkinsfile.public
View File

@ -7,7 +7,7 @@ pipeline {
}
}
options {
timeout(time: 14, unit: 'MINUTES')
timeout(time: 26, unit: 'MINUTES')
}
environment {
NPM_CONFIG_CACHE = '/tmp/npm/cache'
@ -58,7 +58,7 @@ pipeline {
steps {
sh 'psql -U postgres -c \'create database teststorj;\''
sh 'go run scripts/use-ports.go -from 1024 -to 10000 &'
sh 'go test -parallel 4 -p 6 -vet=off $COVERFLAGS -timeout 12m -json -race ./... 2>&1 | tee .build/tests.json | go run ./scripts/xunit.go -out .build/tests.xml'
sh 'go test -parallel 4 -p 6 -vet=off $COVERFLAGS -timeout 20m -json -race ./... 2>&1 | tee .build/tests.json | go run ./scripts/xunit.go -out .build/tests.xml'
sh 'go run scripts/check-clean-directory.go'
}