Skip to content

Commit ad548b4

Browse files
authored
Merge pull request #4951 from jlewi/mlkube_prow
Prow presubmit job to build mlkube.io container.
2 parents 2eb6775 + 6603279 commit ad548b4

File tree

6 files changed

+84
-68
lines changed

6 files changed

+84
-68
lines changed

jobs/config.json

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8069,27 +8069,6 @@
80698069
"sig-cluster-lifecycle"
80708070
]
80718071
},
8072-
"ci-kubernetes-e2e-mlkube-gke": {
8073-
"args": [
8074-
"--charts",
8075-
"--check-leaked-resources",
8076-
"--deployment=gke",
8077-
"--extract=gke",
8078-
"--gcp-cloud-sdk=gs://cloud-sdk-testing/ci/staging",
8079-
"--gcp-node-image=gci",
8080-
"--gcp-project=mlkube-testing",
8081-
"--gcp-zone=us-central1-b",
8082-
"--gke-environment=prod",
8083-
"--mount-paths=$GOPATH/src/github.com/foxish/mlkube.io:/src/k8s.io/charts",
8084-
"--provider=gke",
8085-
"--test=false",
8086-
"--timeout=50m"
8087-
],
8088-
"scenario": "kubernetes_e2e",
8089-
"sigOwners": [
8090-
"sig-big-data"
8091-
]
8092-
},
80938072
"ci-kubernetes-e2e-node-canary": {
80948073
"args": [
80958074
"--deployment=node",

prow/config.yaml

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,6 +2489,31 @@ presubmits:
24892489
hostPath:
24902490
path: /mnt/disks/ssd0
24912491

2492+
jlewi/mlkube.io:
2493+
- name: mlkube-build-presubmit
2494+
context: mlkube-build-presubmit
2495+
agent: kubernetes
2496+
always_run: true # Run for every PR, or only when requested.
2497+
rerun_command: "/test mlkube-build-presubmit"
2498+
trigger: "(?m)^/test( all| mlkube-build-presubmit),?(\\s+|$)"
2499+
branches:
2500+
- master
2501+
spec:
2502+
containers:
2503+
# TODO(jlewi): Replace latest with a specific tag once the images stabilize.
2504+
- image: gcr.io/mlkube-testing/builder:latest
2505+
env:
2506+
- name: GOOGLE_APPLICATION_CREDENTIALS
2507+
value: /etc/service-account/service-account.json
2508+
volumeMounts:
2509+
- name: service
2510+
mountPath: /etc/service-account
2511+
readOnly: true
2512+
volumes:
2513+
- name: service
2514+
secret:
2515+
secretName: service-account
2516+
24922517
postsubmits:
24932518
kubernetes/kubernetes:
24942519
- name: ci-kubernetes-bazel-build
@@ -3263,6 +3288,26 @@ postsubmits:
32633288
secret:
32643289
secretName: service-account
32653290

3291+
jlewi/mlkube.io:
3292+
- name: mlkube-build-postsubmit
3293+
agent: kubernetes
3294+
branches:
3295+
- master
3296+
spec:
3297+
containers:
3298+
# TODO(jlewi): Replace latest with a specific tag once the images stabilize.
3299+
- image: gcr.io/mlkube-testing/builder:latest
3300+
env:
3301+
- name: GOOGLE_APPLICATION_CREDENTIALS
3302+
value: /etc/service-account/service-account.json
3303+
volumeMounts:
3304+
- name: service
3305+
mountPath: /etc/service-account
3306+
readOnly: true
3307+
volumes:
3308+
- name: service
3309+
secret:
3310+
secretName: service-account
32663311

32673312
periodics:
32683313
- interval: 1h
@@ -15700,40 +15745,6 @@ periodics:
1570015745
defaultMode: 256
1570115746
secretName: aws-cred
1570215747

15703-
- interval: 30m
15704-
agent: kubernetes
15705-
name: ci-kubernetes-e2e-mlkube-gke
15706-
spec:
15707-
containers:
15708-
- args:
15709-
- --timeout=70
15710-
- --repo=github.com/foxish/mlkube.io
15711-
env:
15712-
- name: GOOGLE_APPLICATION_CREDENTIALS
15713-
value: /etc/service-account/service-account.json
15714-
- name: USER
15715-
value: prow
15716-
- name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE
15717-
value: /etc/ssh-key-secret/ssh-private
15718-
- name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE
15719-
value: /etc/ssh-key-secret/ssh-public
15720-
image: gcr.io/k8s-testimages/kubekins-e2e:v20171011-8265ed12-master
15721-
volumeMounts:
15722-
- mountPath: /etc/service-account
15723-
name: service
15724-
readOnly: true
15725-
- mountPath: /etc/ssh-key-secret
15726-
name: ssh
15727-
readOnly: true
15728-
volumes:
15729-
- name: service
15730-
secret:
15731-
secretName: service-account
15732-
- name: ssh
15733-
secret:
15734-
defaultMode: 256
15735-
secretName: ssh-key-secret
15736-
1573715748
- name: ci-kubernetes-e2e-node-canary
1573815749
interval: 1h
1573915750
agent: kubernetes
@@ -17240,6 +17251,25 @@ periodics:
1724017251
secret:
1724117252
secretName: velodrome-influxdb
1724217253

17254+
- interval: 8h
17255+
agent: kubernetes
17256+
name: mlkube-build-periodic
17257+
spec:
17258+
containers:
17259+
# TODO(jlewi): Replace latest with a specific tag once the images stabilize.
17260+
- image: gcr.io/mlkube-testing/builder:latest
17261+
env:
17262+
- name: GOOGLE_APPLICATION_CREDENTIALS
17263+
value: /etc/service-account/service-account.json
17264+
volumeMounts:
17265+
- name: service
17266+
mountPath: /etc/service-account
17267+
readOnly: true
17268+
volumes:
17269+
- name: service
17270+
secret:
17271+
secretName: service-account
17272+
1724317273
- name: periodic-kubernetes-bazel-build-1-6
1724417274
interval: 2h
1724517275
agent: kubernetes

prow/config/jobs_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ func TestPresubmits(t *testing.T) {
143143
job.Name = strings.Replace(job.Name, "pull-security-kubernetes", "pull-kubernetes", 1)
144144
if j, present := bootstrapConfig[job.Name]; present {
145145
scenario = fmt.Sprintf("scenarios/%s.py", j.Scenario)
146-
} else {
147-
scenario = fmt.Sprintf("jobs/%s.sh", job.Name)
148146
}
149147

150148
// Ensure that jobs have a shell script of the same name.

prow/plugins.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ triggers:
88
- kubernetes-incubator
99
- kubernetes-security
1010
- google/cadvisor
11+
- jlewi/mlkube.io
1112
trusted_org: kubernetes
1213

1314
heart:
@@ -88,6 +89,9 @@ plugins:
8889
kubernetes-security/kubernetes:
8990
- trigger
9091

92+
jlewi/mlkube.io:
93+
- trigger
94+
9195
spxtr/envoy:
9296
- assign
9397
- close

testgrid/config/config.yaml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,8 +1535,12 @@ test_groups:
15351535
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-gci-master-gci-new-downgrade-cluster-parallel
15361536
- name: ci-kubernetes-e2e-gke-gci-new-gci-master-upgrade-cluster-new
15371537
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-gci-new-gci-master-upgrade-cluster-new
1538-
- name: ci-kubernetes-e2e-mlkube-gke
1539-
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-mlkube-gke
1538+
- name: mlkube-build-periodic
1539+
gcs_prefix: kubernetes-jenkins/logs/mlkube-build-periodic
1540+
- name: mlkube-build-presubmit
1541+
gcs_prefix: kubernetes-jenkins/logs/mlkube-build-presubmit
1542+
- name: mlkube-build-postsubmit
1543+
gcs_prefix: kubernetes-jenkins/logs/mlkube-build-postsubmit
15401544
# kube-proxy daemonset migration jobs
15411545
- name: ci-kubernetes-e2e-gci-gce-latest-downgrade-kube-proxy-ds
15421546
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce-latest-downgrade-kube-proxy-ds
@@ -3081,8 +3085,6 @@ dashboards:
30813085
dashboard_tab:
30823086
- name: charts-gce
30833087
test_group_name: ci-kubernetes-charts-gce
3084-
- name: mlkube-gke
3085-
test_group_name: ci-kubernetes-e2e-mlkube-gke
30863088

30873089
- name: perf-tests
30883090
dashboard_tab:
@@ -3540,12 +3542,15 @@ dashboards:
35403542

35413543
- name: sig-big-data
35423544
dashboard_tab:
3543-
- name: mlkube-gke
3544-
description: what does this tab do exactly
3545-
test_group_name: ci-kubernetes-e2e-mlkube-gke
3546-
notifications:
3547-
- summary: Please configure this skeleton dashboard and remove this notification
3548-
context_link: https://github.com/kubernetes/test-infra/tree/master/testgrid/config
3545+
- name: mlkube-build-periodic
3546+
description: Periodic builds and testing of TfJob CRD at head running on stable GKE.
3547+
test_group_name: mlkube-build-periodic
3548+
- name: mlkube-build-postsubmit
3549+
description: Postsubmit tests of TfJob CRD running on stable GKE.
3550+
test_group_name: mlkube-build-postsubmit
3551+
- name: mlkube-build-presubmit
3552+
description: Presubmit tests of TfJob CRD running on stable GKE.
3553+
test_group_name: mlkube-build-presubmit
35493554

35503555
- name: sig-autoscaling
35513556
dashboard_tab:

testgrid/jenkins_verify/jenkins_validate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func main() {
7676
}
7777

7878
// Also check k/k presubmit, prow postsubmit and periodic jobs
79-
for _, job := range prowConfig.AllPresubmits([]string{"kubernetes/kubernetes"}) {
79+
for _, job := range prowConfig.AllPresubmits([]string{"jlewi/mlkube.io", "kubernetes/kubernetes"}) {
8080
jobs[job.Name] = false
8181
}
8282

0 commit comments

Comments
 (0)