Generate authentikos and genjobs image push jobs

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)
 		}
 	}

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
 }
 

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