Skip to content

Commit 81584c8

Browse files
authored
Merge pull request #23745 from spiffxp/use-make-for-org
config/jobs: use make for kubernetes/org
2 parents 3127df2 + e7e45e8 commit 81584c8

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

config/jobs/kubernetes/org/kubernetes-org-jobs.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ presubmits:
55
decorate: true
66
labels:
77
preset-service-account: "true"
8-
preset-bazel-scratch-dir: "true"
98
spec:
109
containers:
11-
- image: gcr.io/k8s-testimages/launcher.gcr.io/google/bazel:v20210806-38e1be0-org
10+
- image: golang:1.17
1211
command:
13-
- bazel
12+
- make
1413
args:
1514
- test
16-
- --config=ci
17-
- //...
1815
annotations:
1916
testgrid-num-columns-recent: '30'
2017
testgrid-create-test-group: 'true'
@@ -23,12 +20,13 @@ presubmits:
2320
decorate: true
2421
labels:
2522
preset-service-account: "true"
26-
preset-bazel-scratch-dir: "true"
2723
spec:
2824
containers:
29-
- image: gcr.io/k8s-testimages/launcher.gcr.io/google/bazel:v20210806-38e1be0-org
25+
- image: golang:1.17
3026
command:
31-
- ./hack/verify-all.sh
27+
- make
28+
args:
29+
- verify
3230
annotations:
3331
testgrid-num-columns-recent: '30'
3432
testgrid-create-test-group: 'true'

config/jobs/kubernetes/test-infra/test-infra-trusted.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ postsubmits:
88
max_concurrency: 1
99
spec:
1010
containers:
11-
- image: gcr.io/k8s-testimages/launcher.gcr.io/google/bazel:v20210806-38e1be0-org
11+
- image: golang:1.17
1212
command:
13-
- bazel
13+
- make
1414
args:
15-
- run
16-
- //admin:update
15+
- deploy
1716
- --
1817
- --github-endpoint=http://ghproxy.default.svc.cluster.local
1918
- --github-endpoint=https://api.github.com
@@ -539,15 +538,11 @@ periodics:
539538
base_ref: main
540539
spec:
541540
containers:
542-
- image: launcher.gcr.io/google/bazel:0.29.1
543-
env:
544-
- name: USE_BAZEL_VERSION
545-
value: real # Ignore .bazelversion
541+
- image: golang:1.17
546542
command:
547-
- bazel
543+
- make
548544
args:
549-
- run
550-
- //admin:update
545+
- deploy
551546
- --
552547
- --github-endpoint=http://ghproxy.default.svc.cluster.local
553548
- --github-endpoint=https://api.github.com

0 commit comments

Comments
 (0)