Merge pull request kubernetes#496 from krzysied/perfdash_run_id_fix

Perfdash - Run id fix

perfdash/Makefile

@@ -1,7 +1,7 @@
 all: push
 
 # See pod.yaml for the version currently running-- bump this ahead before rebuilding!
-TAG = 1.20
+TAG = 1.21
 
 REPO = gcr.io/k8s-testimages
 

perfdash/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: default
   labels:
     app: perfdash
-    version: "1.20"
+    version: "1.21"
 spec:
   selector:
     matchLabels:
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: perfdash
-        image: gcr.io/k8s-testimages/perfdash:1.20
+        image: gcr.io/k8s-testimages/perfdash:1.21
         command:
           - /perfdash
           -   --www=true

perfdash/google-gcs-downloader.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"sort"
 	"strings"
 	"sync"
 
@@ -82,18 +83,20 @@ func (g *GoogleGCSDownloader) getData() (JobToCategoryData, error) {
 
 func (g *GoogleGCSDownloader) getJobData(wg *sync.WaitGroup, result JobToCategoryData, resultLock *sync.Mutex, job string, tests Tests) {
 	defer wg.Done()
-	lastBuildNo, err := g.GoogleGCSBucketUtils.GetLastestBuildNumberFromJenkinsGoogleBucket(job)
+	buildNumbers, err := g.GoogleGCSBucketUtils.GetBuildNumbersFromJenkinsGoogleBucket(job)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Printf("Last build no for %v: %v\n", job, lastBuildNo)
+
 	buildsToFetch := tests.BuildsCount
 	if buildsToFetch < 1 {
 		buildsToFetch = g.DefaultBuildsCount
 	}
 	fmt.Printf("Builds to fetch for %v: %v\n", job, buildsToFetch)
 
-	for buildNumber := lastBuildNo; buildNumber > lastBuildNo-buildsToFetch && buildNumber > 0; buildNumber-- {
+	sort.Sort(sort.Reverse(sort.IntSlice(buildNumbers)))
+	for index := 0; index < buildsToFetch && index < len(buildNumbers); index++ {
+		buildNumber := buildNumbers[index]
 		fmt.Printf("Fetching %s build %v...\n", job, buildNumber)
 		for categoryLabel, categoryMap := range tests.Descriptions {
 			for testLabel, testDescriptions := range categoryMap {