Generate authentikos and genjobs image push jobs

Travis Clarke · Travis Clarke · commit 841c88d90eaf · 2019-12-11T10:22:46.000-08:00
diff --git a/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml b/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml
diff --git a/prow/config/config_test.go b/prow/config/config_test.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"strings"
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -334,7 +335,7 @@ func TestConfig(t *testing.T) {
 
 func TestTrustedJobs(t *testing.T) {
 	const trusted = "test-infra-trusted"
-	trustedPath := path.Join(*jobConfigPath, "istio", "test-infra", "istio.test-infra.trusted.master.yaml")
+	trustedPath := path.Join(*jobConfigPath, "istio", "test-infra")
 
 	// Presubmits may not use trusted clusters.
 	for _, pre := range c.AllStaticPresubmits(nil) {
@@ -348,7 +349,7 @@ func TestTrustedJobs(t *testing.T) {
 		if post.Cluster != trusted {
 			continue
 		}
-		if post.SourcePath != trustedPath {
+		if !strings.HasPrefix(post.SourcePath, trustedPath) {
 			t.Errorf("%s defined in %s may not run in trusted cluster", post.Name, post.SourcePath)
 		}
 	}
@@ -358,7 +359,7 @@ func TestTrustedJobs(t *testing.T) {
 		if per.Cluster != trusted {
 			continue
 		}
-		if per.SourcePath != trustedPath {
+		if !strings.HasPrefix(per.SourcePath, trustedPath) {
 			t.Errorf("%s defined in %s may not run in trusted cluster", per.Name, per.SourcePath)
 		}
 	}
diff --git a/prow/config/generate.go b/prow/config/generate.go
@@ -91,6 +91,8 @@ type Job struct {
 	Repos          []string          `json:"repos,omitempty"`
 	Image          string            `json:"image,omitempty"`
 	Regex          string            `json:"regex,omitempty"`
+	Cluster        string            `json:"cluster,omitempty"`
+	MaxConcurrency int               `json:"max_concurrency,omitempty"`
 }
 
 // Reads the job yaml
@@ -413,7 +415,8 @@ func createContainer(jobConfig JobConfig, job Job, resources map[string]v1.Resou
 
 func createJobBase(jobConfig JobConfig, job Job, name string, repo string, branch string, resources map[string]v1.ResourceRequirements) config.JobBase {
 	jb := config.JobBase{
-		Name: name,
+		Name:           name,
+		MaxConcurrency: job.MaxConcurrency,
 		Spec: &v1.PodSpec{
 			NodeSelector: map[string]string{"testing": "test-pool"},
 			Containers:   createContainer(jobConfig, job, resources),
@@ -434,6 +437,9 @@ func createJobBase(jobConfig JobConfig, job Job, name string, repo string, branc
 			Timeout: job.Timeout,
 		}
 	}
+	if job.Cluster != "" && job.Cluster != "default" {
+		jb.Cluster = job.Cluster
+	}
 	return jb
 }
 
diff --git a/prow/config/jobs/test-infra.yaml b/prow/config/jobs/test-infra.yaml
@@ -11,3 +11,31 @@ jobs:
 
   - name: gencheck
     command: [make, gen-check]
+
+  - name: push-authentikos
+    type: postsubmit
+    regex: '^authentikos/Makefile$'
+    cluster: test-infra-trusted
+    max_concurrency: 1
+    command:
+    - entrypoint
+    - make
+    - -C
+    - authentios
+    - deploy
+    requirements:
+    - docker
+
+  - name: push-genjobs
+    type: postsubmit
+    regex: '^prow/genjobs/Makefile$'
+    cluster: test-infra-trusted
+    max_concurrency: 1
+    command:
+    - entrypoint
+    - make
+    - -C
+    - prow/genjobs
+    - deploy
+    requirements:
+    - docker

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`	`"os"`
`21`	`21`	`"path"`
	`22`	`+ "strings"`
`22`	`23`	`"testing"`
`23`	`24`
`24`	`25`	`"k8s.io/apimachinery/pkg/util/sets"`
`@@ -334,7 +335,7 @@ func TestConfig(t *testing.T) {`
`334`	`335`
`335`	`336`	`func TestTrustedJobs(t *testing.T) {`
`336`	`337`	`const trusted = "test-infra-trusted"`
`337`		`- trustedPath := path.Join(*jobConfigPath, "istio", "test-infra", "istio.test-infra.trusted.master.yaml")`
	`338`	`+ trustedPath := path.Join(*jobConfigPath, "istio", "test-infra")`
`338`	`339`
`339`	`340`	`// Presubmits may not use trusted clusters.`
`340`	`341`	`for _, pre := range c.AllStaticPresubmits(nil) {`
`@@ -348,7 +349,7 @@ func TestTrustedJobs(t *testing.T) {`
`348`	`349`	`if post.Cluster != trusted {`
`349`	`350`	`continue`
`350`	`351`	`}`
`351`		`- if post.SourcePath != trustedPath {`
	`352`	`+ if !strings.HasPrefix(post.SourcePath, trustedPath) {`
`352`	`353`	`t.Errorf("%s defined in %s may not run in trusted cluster", post.Name, post.SourcePath)`
`353`	`354`	`}`
`354`	`355`	`}`
`@@ -358,7 +359,7 @@ func TestTrustedJobs(t *testing.T) {`
`358`	`359`	`if per.Cluster != trusted {`
`359`	`360`	`continue`
`360`	`361`	`}`
`361`		`- if per.SourcePath != trustedPath {`
	`362`	`+ if !strings.HasPrefix(per.SourcePath, trustedPath) {`
`362`	`363`	`t.Errorf("%s defined in %s may not run in trusted cluster", per.Name, per.SourcePath)`
`363`	`364`	`}`
`364`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@ type Job struct {`
`91`	`91`	Repos []string `json:"repos,omitempty"`
`92`	`92`	Image string `json:"image,omitempty"`
`93`	`93`	Regex string `json:"regex,omitempty"`
	`94`	+ Cluster string `json:"cluster,omitempty"`
	`95`	+ MaxConcurrency int `json:"max_concurrency,omitempty"`
`94`	`96`	`}`
`95`	`97`
`96`	`98`	`// Reads the job yaml`
`@@ -413,7 +415,8 @@ func createContainer(jobConfig JobConfig, job Job, resources map[string]v1.Resou`
`413`	`415`
`414`	`416`	`func createJobBase(jobConfig JobConfig, job Job, name string, repo string, branch string, resources map[string]v1.ResourceRequirements) config.JobBase {`
`415`	`417`	`jb := config.JobBase{`
`416`		`- Name: name,`
	`418`	`+ Name: name,`
	`419`	`+ MaxConcurrency: job.MaxConcurrency,`
`417`	`420`	`Spec: &v1.PodSpec{`
`418`	`421`	`NodeSelector: map[string]string{"testing": "test-pool"},`
`419`	`422`	`Containers: createContainer(jobConfig, job, resources),`
`@@ -434,6 +437,9 @@ func createJobBase(jobConfig JobConfig, job Job, name string, repo string, branc`
`434`	`437`	`Timeout: job.Timeout,`
`435`	`438`	`}`
`436`	`439`	`}`
	`440`	`+ if job.Cluster != "" && job.Cluster != "default" {`
	`441`	`+ jb.Cluster = job.Cluster`
	`442`	`+ }`
`437`	`443`	`return jb`
`438`	`444`	`}`
`439`	`445`