add non-blocking jenkins jobs

Author: lavalamp

hack/verify-flags/known-flags.txt

@@ -49,6 +49,7 @@ max-pr-number
 max-sync-failures
 min-pr-number
 network-config
+nonblocking-jenkins-jobs
 nginx-configmap
 number-of-old-test-results
 on-change

mungegithub/mungers/e2e/e2e.go

@@ -49,8 +49,9 @@ type BuildInfo struct {
 // RealE2ETester is the object which will get status from a google bucket
 // information about recent jobs
 type RealE2ETester struct {
-	BlockingJobNames   []string
-	WeakStableJobNames []string
+	BlockingJobNames    []string
+	NonBlockingJobNames []string
+	WeakStableJobNames  []string
 
 	sync.Mutex
 	BuildStatus          map[string]BuildInfo // protect by mutex
@@ -217,6 +218,23 @@ func (e *RealE2ETester) GCSBasedStable() (allStable, ignorableFlakes bool) {
 		e.setBuildStatus(job, "Not Stable", strconv.Itoa(lastBuildNumber))
 	}
 
+	// Also get status for non-blocking jobs
+	for _, job := range e.NonBlockingJobNames {
+		lastBuildNumber, err := e.GoogleGCSBucketUtils.GetLastestBuildNumberFromJenkinsGoogleBucket(job)
+		glog.V(4).Infof("Checking status of %v, %v", job, lastBuildNumber)
+		if err != nil {
+			glog.Errorf("Error while getting data for %v: %v", job, err)
+			e.setBuildStatus(job, "[nonblocking] Not Stable", strconv.Itoa(lastBuildNumber))
+			continue
+		}
+
+		if thisResult, err := e.GetBuildResult(job, lastBuildNumber); err != nil || thisResult.Status != cache.ResultStable {
+			e.setBuildStatus(job, "[nonblocking] Not Stable", strconv.Itoa(lastBuildNumber))
+		} else {
+			e.setBuildStatus(job, "[nonblocking] Stable", strconv.Itoa(lastBuildNumber))
+		}
+	}
+
 	return allStable, ignorableFlakes
 }
 

mungegithub/mungers/e2e/e2e_test.go

@@ -47,18 +47,19 @@ func marshalOrDie(obj interface{}, t *testing.T) []byte {
 }
 
 func genMockGCSListResponse(files ...string) []byte {
-	resptemplate := "{\"items\":[%s]}"
-	itemTempalte := "{\"name\":\"%s\"}"
+	respTemplate := "{\"items\":[%s]}"
+	itemTemplate := "{\"name\":\"%s\"}"
 	items := []string{}
 	for _, file := range files {
-		items = append(items, fmt.Sprintf(itemTempalte, file))
+		items = append(items, fmt.Sprintf(itemTemplate, file))
 	}
-	return []byte(fmt.Sprintf(resptemplate, strings.Join(items, ",")))
+	return []byte(fmt.Sprintf(respTemplate, strings.Join(items, ",")))
 }
 
 func TestCheckGCSBuilds(t *testing.T) {
 	latestBuildNumberFoo := 42
 	latestBuildNumberBar := 44
+	latestBuildNumberBaz := 99
 	tests := []struct {
 		paths             map[string][]byte
 		expectStable      bool
@@ -77,12 +78,18 @@ func TestCheckGCSBuilds(t *testing.T) {
 					Result:    "SUCCESS",
 					Timestamp: 1234,
 				}, t),
+				"/baz/latest-build.txt": []byte(strconv.Itoa(latestBuildNumberBaz)),
+				fmt.Sprintf("/baz/%v/finished.json", latestBuildNumberBaz): marshalOrDie(utils.FinishedFile{
+					Result:    "UNSTABLE",
+					Timestamp: 1234,
+				}, t),
 				"/": genMockGCSListResponse(),
 			},
 			expectStable: true,
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "99"},
 			},
 		},
 		{
@@ -97,12 +104,18 @@ func TestCheckGCSBuilds(t *testing.T) {
 					Result:    "UNSTABLE",
 					Timestamp: 1234,
 				}, t),
+				"/baz/latest-build.txt": []byte(strconv.Itoa(latestBuildNumberBaz)),
+				fmt.Sprintf("/baz/%v/finished.json", latestBuildNumberBaz): marshalOrDie(utils.FinishedFile{
+					Result:    "SUCCESS",
+					Timestamp: 1234,
+				}, t),
 				"/": genMockGCSListResponse(),
 			},
 			expectStable: false,
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Not Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Stable", ID: "99"},
 			},
 		},
 		{
@@ -140,6 +153,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Ignorable flake", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 		{
@@ -177,6 +191,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Ignorable flake", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 		{
@@ -214,6 +229,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Not Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 
@@ -235,6 +251,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Stable", ID: "42"},
 				"bar": {Status: "Not Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 		{
@@ -255,6 +272,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Not Stable", ID: "42"},
 				"bar": {Status: "Not Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 		{
@@ -275,6 +293,7 @@ func TestCheckGCSBuilds(t *testing.T) {
 			expectedStatus: map[string]BuildInfo{
 				"foo": {Status: "Not Stable", ID: "42"},
 				"bar": {Status: "Stable", ID: "44"},
+				"baz": {Status: "[nonblocking] Not Stable", ID: "-1"},
 			},
 		},
 	}
@@ -296,6 +315,9 @@ func TestCheckGCSBuilds(t *testing.T) {
 				"foo",
 				"bar",
 			},
+			NonBlockingJobNames: []string{
+				"baz",
+			},
 			BuildStatus:          map[string]BuildInfo{},
 			GoogleGCSBucketUtils: utils.NewTestUtils(server.URL),
 		}

mungegithub/mungers/submit-queue.go

@@ -135,9 +135,10 @@ type submitQueueInterruptedObject struct {
 //  PR must have passed all github CI checks
 //  The google internal jenkins instance must be passing the BlockingJobNames e2e tests
 type SubmitQueue struct {
-	githubConfig       *github.Config
-	BlockingJobNames   []string
-	WeakStableJobNames []string
+	githubConfig        *github.Config
+	BlockingJobNames    []string
+	NonBlockingJobNames []string
+	WeakStableJobNames  []string
 
 	// If FakeE2E is true, don't try to connect to JenkinsHost, all jobs are passing.
 	FakeE2E bool
@@ -303,6 +304,7 @@ func (sq *SubmitQueue) internalInitialize(config *github.Config, features *featu
 
 	// Clean up all of our flags which we wish --flag="" to mean []string{}
 	sq.BlockingJobNames = cleanStringSlice(sq.BlockingJobNames)
+	sq.NonBlockingJobNames = cleanStringSlice(sq.NonBlockingJobNames)
 	sq.WeakStableJobNames = cleanStringSlice(sq.WeakStableJobNames)
 	sq.RequiredStatusContexts = cleanStringSlice(sq.RequiredStatusContexts)
 	sq.RequiredRetestContexts = cleanStringSlice(sq.RequiredRetestContexts)
@@ -326,6 +328,7 @@ func (sq *SubmitQueue) internalInitialize(config *github.Config, features *featu
 
 		sq.e2e = (&e2e.RealE2ETester{
 			BlockingJobNames:     sq.BlockingJobNames,
+			NonBlockingJobNames:  sq.NonBlockingJobNames,
 			WeakStableJobNames:   sq.WeakStableJobNames,
 			BuildStatus:          map[string]e2e.BuildInfo{},
 			GoogleGCSBucketUtils: gcs,
@@ -387,6 +390,12 @@ func (sq *SubmitQueue) EachLoop() error {
 
 // AddFlags will add any request flags to the cobra `cmd`
 func (sq *SubmitQueue) AddFlags(cmd *cobra.Command, config *github.Config) {
+	cmd.Flags().StringSliceVar(&sq.NonBlockingJobNames, "nonblocking-jenkins-jobs", []string{
+		"kubernetes-e2e-gke-prod",
+		"kubernetes-e2e-gke-subnet",
+		"kubernetes-e2e-gke-test",
+		"kubernetes-e2e-gce-examples",
+	}, "Comma separated list of jobs that don't block merges, but will have status reported and issues filed.")
 	cmd.Flags().StringSliceVar(&sq.BlockingJobNames, "jenkins-jobs", []string{
 		"kubelet-gce-e2e-ci",
 		"kubernetes-build",
@@ -398,7 +407,7 @@ func (sq *SubmitQueue) AddFlags(cmd *cobra.Command, config *github.Config) {
 		"kubernetes-e2e-gke-slow",
 		"kubernetes-e2e-gce-scalability",
 		"kubernetes-kubemark-5-gce",
-	}, "Comma separated list of jobs in Jenkins to use for stability testing")
+	}, "Comma separated list of jobs in Jenkins that should block merges if failing.")
 	cmd.Flags().StringSliceVar(&sq.WeakStableJobNames, "weak-stable-jobs",
 		[]string{},
 		"Comma separated list of jobs in Jenkins to use for stability testing that needs only weak success")