Merge pull request #349 from xueweiz/test

Allow e2e test to rent project from Boskos

Author: k8s-ci-robot

Makefile

@@ -115,6 +115,7 @@ e2e-test: vet fmt build-tar
 	-image=$(VM_IMAGE) -image-project=$(IMAGE_PROJECT) \
 	-ssh-user=$(SSH_USER) -ssh-key=$(SSH_KEY) \
 	-npd-build-tar=`pwd`/$(TARBALL) \
+	-boskos-project-type=$(BOSKOS_PROJECT_TYPE) -job-name=$(JOB_NAME) \
 	-artifacts-dir=$(ARTIFACTS)
 
 build-binaries: ./bin/node-problem-detector ./bin/log-counter

go.mod

@@ -3,61 +3,43 @@ module k8s.io/node-problem-detector
 go 1.11
 
 require (
+	cloud.google.com/go v0.43.0
 	code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c
 	contrib.go.opencensus.io/exporter/prometheus v0.0.0-20190427222117-f6cda26f80a3
 	contrib.go.opencensus.io/exporter/stackdriver v0.12.5
-	github.com/PuerkitoBio/purell v1.0.0 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 // indirect
 	github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
 	github.com/avast/retry-go v2.4.1+incompatible
-	github.com/beorn7/perks v1.0.0 // indirect
 	github.com/cobaugh/osrelease v0.0.0-20181218015638-a93a0a55a249
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
-	github.com/coreos/pkg v0.0.0-20160620232715-fa29b1d70f0b // indirect
 	github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 // indirect
 	github.com/euank/go-kmsg-parser v2.0.1+incompatible
-	github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 // indirect
 	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1 // indirect
-	github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9 // indirect
-	github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501 // indirect
-	github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20150125180832-604ed5785183 // indirect
 	github.com/google/cadvisor v0.33.0
-	github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 // indirect
-	github.com/googleapis/gnostic v0.1.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20170926212834-c1f8028e62ad // indirect
 	github.com/howeyc/gopass v0.0.0-20160826175423-3ca23474a7c7 // indirect
-	github.com/imdario/mergo v0.0.0-20141206190957-6633656539c1 // indirect
-	github.com/json-iterator/go v0.0.0-20171130024224-051434fab7e0 // indirect
 	github.com/juju/ratelimit v0.0.0-20170523012141-5b9ff8664717 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a // indirect
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/pborman/uuid v1.2.0
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
-	github.com/prometheus/common v0.3.0
-	github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 // indirect
+	github.com/prometheus/common v0.4.1
 	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
 	github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d // indirect
 	github.com/spf13/pflag v1.0.3
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.4.0
 	github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc // indirect
 	go.opencensus.io v0.22.0
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	google.golang.org/api v0.7.0
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/inf.v0 v0.9.0 // indirect
 	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
-	k8s.io/api v0.0.0-20180127130940-acf347b865f2
-	k8s.io/apimachinery v0.0.0-20180126010752-19e3f5aa3adc
-	k8s.io/client-go v0.0.0-20180103015815-9389c055a838
+	k8s.io/api v0.0.0-20190816222004-e3a6b8045b0b
+	k8s.io/apimachinery v0.0.0-20190816221834-a9f1d8a9c101
+	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/heapster v0.0.0-20180704153620-b25f8a16208f
-	k8s.io/klog v0.3.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20180216212618-50ae88d24ede // indirect
-	k8s.io/kubernetes v1.14.2
+	k8s.io/kubernetes v1.14.6
+	k8s.io/test-infra v0.0.0-20190914015041-e1cbc3ccd91c
 )
+
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

go.sum

@@ -110,10 +110,11 @@ func (c *conditionManager) GetConditions() []types.Condition {
 }
 
 func (c *conditionManager) syncLoop() {
-	updateCh := c.clock.Tick(updatePeriod)
+	ticker := c.clock.NewTicker(updatePeriod)
+	defer ticker.Stop()
 	for {
 		select {
-		case <-updateCh:
+		case <-ticker.C():
 			if c.needUpdates() || c.needResync() || c.needHeartbeat() {
 				c.sync()
 			}

pkg/exporters/k8sexporter/condition/manager.go

@@ -17,13 +17,16 @@ limitations under the License.
 package e2e_metric_only
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 	"path"
 	"testing"
+	"time"
 
 	"k8s.io/node-problem-detector/test/e2e/lib/gce"
+	"k8s.io/test-infra/boskos/client"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/reporters"
@@ -36,10 +39,17 @@ var zone = flag.String("zone", "", "gce zone the hosts live in")
 var project = flag.String("project", "", "gce project the hosts live in")
 var image = flag.String("image", "", "image to test")
 var imageProject = flag.String("image-project", "", "gce project of the OS image")
+var jobName = flag.String("job-name", "", "name of the Prow job running the test")
 var sshKey = flag.String("ssh-key", "", "path to ssh private key.")
 var sshUser = flag.String("ssh-user", "", "use predefined user for ssh.")
 var npdBuildTar = flag.String("npd-build-tar", "", "tarball containing NPD to be tested.")
 var artifactsDir = flag.String("artifacts-dir", "", "local directory to save test artifacts into.")
+var boskosProjectType = flag.String("boskos-project-type", "gce-project",
+	"specifies which project type to select from Boskos.")
+var boskosServerURL = flag.String("boskos-server-url", "http://boskos.test-pods.svc.cluster.local",
+	"specifies Boskos server URL.")
+var boskosWaitDuration = flag.Duration("boskos-wait-duration", 5*time.Minute,
+	"Duration to wait before quitting getting Boskos resource.")
 
 var computeService *compute.Service
 
@@ -48,6 +58,13 @@ func TestNPD(t *testing.T) {
 		t.Skip("skipping test in short mode.")
 	}
 
+	if *project == "" {
+		boskosClient := client.NewClient(*jobName, *boskosServerURL)
+		*project = acquireProjectOrDie(boskosClient)
+
+		defer releaseProjectOrDie(boskosClient)
+	}
+
 	if *artifactsDir != "" {
 		_, err := os.Stat(*artifactsDir)
 		if err != nil && os.IsNotExist(err) {
@@ -60,6 +77,37 @@ func TestNPD(t *testing.T) {
 	ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "NPD Metric-only Suite", []ginkgo.Reporter{junitReporter})
 }
 
+func acquireProjectOrDie(boskosClient *client.Client) string {
+	fmt.Printf("Renting project from Boskos\n")
+	ctx, cancel := context.WithTimeout(context.Background(), *boskosWaitDuration)
+	defer cancel()
+	p, err := boskosClient.AcquireWait(ctx, *boskosProjectType, "free", "busy")
+	if err != nil {
+		panic(fmt.Sprintf("Unable to rent project from Boskos: %v\n", err))
+	}
+	fmt.Printf("Rented project %s from Boskos", p.Name)
+
+	go func(boskosClient *client.Client, projectName string) {
+		for range time.Tick(5 * time.Minute) {
+			if err := boskosClient.UpdateOne(projectName, "busy", nil); err != nil {
+				fmt.Printf("Failed to update status for project %s with Boskos: %v\n", projectName, err)
+			}
+		}
+	}(boskosClient, p.Name)
+
+	return p.Name
+}
+
+func releaseProjectOrDie(boskosClient *client.Client) {
+	if !boskosClient.HasResource() {
+		return
+	}
+	err := boskosClient.ReleaseAll("dirty")
+	if err != nil {
+		panic(fmt.Sprintf("Failed to release project to Boskos: %v", err))
+	}
+}
+
 func TestMain(m *testing.M) {
 	flag.Parse()