Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Change vagrant timeout mechanism #11858

Merged
merged 1 commit into from Jun 3, 2020
Merged

ci: Change vagrant timeout mechanism #11858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 6 additions & 12 deletions jenkinsfiles/ginkgo.Jenkinsfile
View file
Open in desktop
Expand Up @@ -126,10 +126,8 @@ pipeline {
sh 'mkdir -p ${GOPATH}/src/github.com/cilium'
sh 'cp -a ${WORKSPACE}/${PROJ_PATH} ${GOPATH}/${PROJ_PATH}'
retry(3) {
timeout(time: 30, unit: 'MINUTES'){
sh 'cd ${TESTDIR}; vagrant destroy runtime --force'
sh 'cd ${TESTDIR}; vagrant up runtime --provision'
}
sh 'cd ${TESTDIR}; vagrant destroy runtime --force'
sh 'cd ${TESTDIR}; timeout 30m vagrant up runtime --provision'
}
}
post {
Expand Down Expand Up @@ -158,10 +156,8 @@ pipeline {
sh 'mkdir -p ${GOPATH}/src/github.com/cilium'
sh 'cp -a ${WORKSPACE}/${PROJ_PATH} ${GOPATH}/${PROJ_PATH}'
retry(3) {
timeout(time: 45, unit: 'MINUTES'){
dir("${TESTDIR}") {
sh 'CILIUM_REGISTRY="$(./print-node-ip.sh)" ./vagrant-ci-start.sh'
}
dir("${TESTDIR}") {
sh 'CILIUM_REGISTRY="$(./print-node-ip.sh)" timeout 45m ./vagrant-ci-start.sh'
}
}
}
Expand All @@ -187,10 +183,8 @@ pipeline {
sh 'mkdir -p ${GOPATH}/src/github.com/cilium'
sh 'cp -a ${WORKSPACE}/${PROJ_PATH} ${GOPATH}/${PROJ_PATH}'
retry(3) {
timeout(time: 45, unit: 'MINUTES'){
dir("${TESTDIR}") {
sh 'CILIUM_REGISTRY="$(./print-node-ip.sh)" ./vagrant-ci-start.sh'
}
dir("${TESTDIR}") {
sh 'CILIUM_REGISTRY="$(./print-node-ip.sh)" timeout 45m ./vagrant-ci-start.sh'
}
}
}
Expand Down
11 changes: 4 additions & 7 deletions jenkinsfiles/kubernetes-upstream.Jenkinsfile
View file
Open in desktop
Expand Up @@ -78,17 +78,14 @@ pipeline {
}
stage('Boot VMs'){
options {
timeout(time: 60, unit: 'MINUTES')
timeout(time: 70, unit: 'MINUTES')
}

steps {
retry(3){
timeout(time: 20, unit: 'MINUTES'){
sh 'cd ${TESTDIR}; vagrant destroy k8s1-${K8S_VERSION} --force'
sh 'cd ${TESTDIR}; vagrant destroy k8s2-${K8S_VERSION} --force'
sh 'cd ${TESTDIR}; vagrant up k8s1-${K8S_VERSION}'
sh 'cd ${TESTDIR}; vagrant up k8s2-${K8S_VERSION}'
}
sh 'cd ${TESTDIR}; vagrant destroy k8s1-${K8S_VERSION} --force'
sh 'cd ${TESTDIR}; vagrant destroy k8s2-${K8S_VERSION} --force'
sh 'cd ${TESTDIR}; timeout 20m vagrant up k8s1-${K8S_VERSION} k8s2-${K8S_VERSION}'
}
}
}
Expand Down