github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102209 from odinuge/node-e2e-fix

Browse Source 
Ignore first SIGINT in node-e2e tests
This commit is contained in:
Kubernetes Prow Robot 2021-06-15 11:31:23 -07:00 committed by GitHub
commit fa152d25d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e_node/runner/remote/run_remote.go
View File

@ -29,6 +29,7 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"os/signal"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
@ -200,6 +201,20 @@ func main() {
klog.Fatalf("--test-suite must be one of default, cadvisor, or conformance") klog.Fatalf("--test-suite must be one of default, cadvisor, or conformance")
} }
// Listen for SIGINT and ignore the first one. In case SIGINT is sent to this
// process and all its children, we ignore it here, while our children ssh connections
// are stopped. This allows us to gather artifacts and print out test state before
// being killed.
c := make(chan os.Signal)
signal.Notify(c, os.Interrupt)
go func() {
<-c
fmt.Printf("Received SIGINT. Will exit on next SIGINT.\n")
<-c
fmt.Printf("Received another SIGINT. Will exit.\n")
os.Exit(1)
}()
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
if *buildOnly { if *buildOnly {
// Build the archive and exit // Build the archive and exit