Skip to content

Commit 9fdf8f4

Browse files
committed
drop separate licenses check on master
Signed-off-by: Tim Ramlot <[email protected]>
1 parent 9796cc2 commit 9fdf8f4

File tree

2 files changed

+10
-35
lines changed

2 files changed

+10
-35
lines changed

config/jobs/cert-manager/cert-manager/master/cert-manager-master.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -285,40 +285,6 @@ presubmits:
285285
- master
286286
always_run: true
287287
optional: false
288-
- name: pull-cert-manager-master-license
289-
max_concurrency: 8
290-
decorate: true
291-
annotations:
292-
description: Verifies LICENSES are up to date; only needs to be run if go.mod
293-
has changed
294-
testgrid-alert-email: [email protected]
295-
testgrid-create-job-group: "true"
296-
testgrid-dashboards: cert-manager-presubmits-master
297-
labels:
298-
preset-go-cache: "true"
299-
preset-local-cache: "true"
300-
spec:
301-
containers:
302-
- image: europe-west1-docker.pkg.dev/cert-manager-tests-trusted/cert-manager-infra-images/make-dind:20250327-af35b2b-bookworm
303-
args:
304-
- runner
305-
- make
306-
- vendor-go
307-
- verify-licenses
308-
resources:
309-
requests:
310-
cpu: "1"
311-
memory: 1Gi
312-
dnsPolicy: None
313-
dnsConfig:
314-
nameservers:
315-
- 8.8.8.8
316-
- 8.8.4.4
317-
branches:
318-
- master
319-
always_run: false
320-
optional: true
321-
run_if_changed: go.mod
322288
- name: pull-cert-manager-master-e2e-v1-34-issuers-venafi-tpp
323289
max_concurrency: 4
324290
decorate: true

config/prowgen/prowspecs/specs.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ var knownBranches map[string]BranchSpec = map[string]BranchSpec{
5353

5454
e2eCPURequest: "7000m",
5555
e2eMemoryRequest: "6Gi",
56+
57+
checkLicensesSeparately: true,
5658
},
5759
"release-1.18": {
5860
prowContext: &pkg.ProwContext{
@@ -74,6 +76,8 @@ var knownBranches map[string]BranchSpec = map[string]BranchSpec{
7476

7577
e2eCPURequest: "7000m",
7678
e2eMemoryRequest: "6Gi",
79+
80+
checkLicensesSeparately: true,
7781
},
7882
"master": {
7983
prowContext: &pkg.ProwContext{
@@ -113,6 +117,9 @@ type BranchSpec struct {
113117

114118
// TODO: remove this field once we've migrated to the new set of container names
115119
containerNames []string
120+
121+
// TODO: remove this field once we've migrated fully to the licenses makefile module
122+
checkLicensesSeparately bool
116123
}
117124

118125
// GenerateJobFile will create a complete test file based on the BranchSpec. This
@@ -129,7 +136,9 @@ func (m *BranchSpec) GenerateJobFile() *pkg.JobFile {
129136

130137
m.prowContext.RequiredPresubmit(pkg.UpgradeTest(m.prowContext, m.primaryKubernetesVersion))
131138

132-
m.prowContext.OptionalPresubmitIfChanged(pkg.LicenseTest(m.prowContext), `go.mod`)
139+
if m.checkLicensesSeparately {
140+
m.prowContext.OptionalPresubmitIfChanged(pkg.LicenseTest(m.prowContext), `go.mod`)
141+
}
133142

134143
m.prowContext.OptionalPresubmit(pkg.E2ETestVenafiTPP(m.prowContext, m.primaryKubernetesVersion, m.e2eCPURequest, m.e2eMemoryRequest))
135144
m.prowContext.OptionalPresubmit(pkg.E2ETestVenafiCloud(m.prowContext, m.primaryKubernetesVersion, m.e2eCPURequest, m.e2eMemoryRequest))

0 commit comments

Comments
 (0)