Skip to content

Commit 8dbd1f0

Browse files
committed
ccpmso: remove unused built image from variant configs
The `periodics` variant configs do not need to contain `images` stanza (unless something in the jobs themselves needs the built image). The periodics are configured to install/update to `releases.latest` unmodified, but the jobs will still build the image from whatever the corresponding branch HEAD at the trigger time. This takes time, a bit of compute and also causes a redundant -images job to exist. None of this is necessary.
1 parent 136306d commit 8dbd1f0

6 files changed

+0
-198
lines changed

ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20__periodics.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ base_images:
1717
tag: openstack-installer
1818
build_root:
1919
from_repository: true
20-
images:
21-
- dockerfile_path: Dockerfile
22-
inputs:
23-
ocp_4.20_base-rhel9:
24-
as:
25-
- registry.ci.openshift.org/ocp/4.20:base-rhel9
26-
ocp_builder_rhel-9-golang-1.24-openshift-4.20:
27-
as:
28-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
29-
to: cluster-control-plane-machine-set-operator
3020
releases:
3121
arm64-latest:
3222
candidate:

ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21__periodics.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ base_images:
1717
tag: openstack-installer
1818
build_root:
1919
from_repository: true
20-
images:
21-
- dockerfile_path: Dockerfile
22-
inputs:
23-
ocp_4.21_base-rhel9:
24-
as:
25-
- registry.ci.openshift.org/ocp/4.21:base-rhel9
26-
ocp_builder_rhel-9-golang-1.24-openshift-4.21:
27-
as:
28-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
29-
to: cluster-control-plane-machine-set-operator
3020
releases:
3121
arm64-latest:
3222
candidate:

ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.22__periodics.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ base_images:
1717
tag: openstack-installer
1818
build_root:
1919
from_repository: true
20-
images:
21-
- dockerfile_path: Dockerfile
22-
inputs:
23-
ocp_4.21_base-rhel9:
24-
as:
25-
- registry.ci.openshift.org/ocp/4.21:base-rhel9
26-
ocp_builder_rhel-9-golang-1.24-openshift-4.21:
27-
as:
28-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
29-
to: cluster-control-plane-machine-set-operator
3020
releases:
3121
arm64-latest:
3222
candidate:

ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20-presubmits.yaml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,62 +2417,6 @@ presubmits:
24172417
secret:
24182418
secretName: result-aggregator
24192419
trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*)
2420-
- agent: kubernetes
2421-
always_run: true
2422-
branches:
2423-
- ^release-4\.20$
2424-
- ^release-4\.20-
2425-
cluster: build08
2426-
context: ci/prow/periodics-images
2427-
decorate: true
2428-
labels:
2429-
ci-operator.openshift.io/variant: periodics
2430-
ci.openshift.io/generator: prowgen
2431-
job-release: "4.20"
2432-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2433-
name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-images
2434-
rerun_command: /test periodics-images
2435-
spec:
2436-
containers:
2437-
- args:
2438-
- --gcs-upload-secret=/secrets/gcs/service-account.json
2439-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2440-
- --report-credentials-file=/etc/report/credentials
2441-
- --target=[images]
2442-
- --variant=periodics
2443-
command:
2444-
- ci-operator
2445-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
2446-
imagePullPolicy: Always
2447-
name: ""
2448-
resources:
2449-
requests:
2450-
cpu: 10m
2451-
volumeMounts:
2452-
- mountPath: /secrets/gcs
2453-
name: gcs-credentials
2454-
readOnly: true
2455-
- mountPath: /secrets/manifest-tool
2456-
name: manifest-tool-local-pusher
2457-
readOnly: true
2458-
- mountPath: /etc/pull-secret
2459-
name: pull-secret
2460-
readOnly: true
2461-
- mountPath: /etc/report
2462-
name: result-aggregator
2463-
readOnly: true
2464-
serviceAccountName: ci-operator
2465-
volumes:
2466-
- name: manifest-tool-local-pusher
2467-
secret:
2468-
secretName: manifest-tool-local-pusher
2469-
- name: pull-secret
2470-
secret:
2471-
secretName: registry-pull-credentials
2472-
- name: result-aggregator
2473-
secret:
2474-
secretName: result-aggregator
2475-
trigger: (?m)^/test( | .* )periodics-images,?($|\s.*)
24762420
- agent: kubernetes
24772421
always_run: false
24782422
branches:

ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21-presubmits.yaml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,62 +2282,6 @@ presubmits:
22822282
secret:
22832283
secretName: result-aggregator
22842284
trigger: (?m)^/test( | .* )lint,?($|\s.*)
2285-
- agent: kubernetes
2286-
always_run: true
2287-
branches:
2288-
- ^release-4\.21$
2289-
- ^release-4\.21-
2290-
cluster: build08
2291-
context: ci/prow/periodics-images
2292-
decorate: true
2293-
labels:
2294-
ci-operator.openshift.io/variant: periodics
2295-
ci.openshift.io/generator: prowgen
2296-
job-release: "4.21"
2297-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2298-
name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.21-periodics-images
2299-
rerun_command: /test periodics-images
2300-
spec:
2301-
containers:
2302-
- args:
2303-
- --gcs-upload-secret=/secrets/gcs/service-account.json
2304-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2305-
- --report-credentials-file=/etc/report/credentials
2306-
- --target=[images]
2307-
- --variant=periodics
2308-
command:
2309-
- ci-operator
2310-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
2311-
imagePullPolicy: Always
2312-
name: ""
2313-
resources:
2314-
requests:
2315-
cpu: 10m
2316-
volumeMounts:
2317-
- mountPath: /secrets/gcs
2318-
name: gcs-credentials
2319-
readOnly: true
2320-
- mountPath: /secrets/manifest-tool
2321-
name: manifest-tool-local-pusher
2322-
readOnly: true
2323-
- mountPath: /etc/pull-secret
2324-
name: pull-secret
2325-
readOnly: true
2326-
- mountPath: /etc/report
2327-
name: result-aggregator
2328-
readOnly: true
2329-
serviceAccountName: ci-operator
2330-
volumes:
2331-
- name: manifest-tool-local-pusher
2332-
secret:
2333-
secretName: manifest-tool-local-pusher
2334-
- name: pull-secret
2335-
secret:
2336-
secretName: registry-pull-credentials
2337-
- name: result-aggregator
2338-
secret:
2339-
secretName: result-aggregator
2340-
trigger: (?m)^/test( | .* )periodics-images,?($|\s.*)
23412285
- agent: kubernetes
23422286
always_run: false
23432287
branches:

ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.22-presubmits.yaml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,62 +2281,6 @@ presubmits:
22812281
secret:
22822282
secretName: result-aggregator
22832283
trigger: (?m)^/test( | .* )lint,?($|\s.*)
2284-
- agent: kubernetes
2285-
always_run: true
2286-
branches:
2287-
- ^release-4\.22$
2288-
- ^release-4\.22-
2289-
cluster: build09
2290-
context: ci/prow/periodics-images
2291-
decorate: true
2292-
labels:
2293-
ci-operator.openshift.io/variant: periodics
2294-
ci.openshift.io/generator: prowgen
2295-
job-release: "4.22"
2296-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2297-
name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.22-periodics-images
2298-
rerun_command: /test periodics-images
2299-
spec:
2300-
containers:
2301-
- args:
2302-
- --gcs-upload-secret=/secrets/gcs/service-account.json
2303-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2304-
- --report-credentials-file=/etc/report/credentials
2305-
- --target=[images]
2306-
- --variant=periodics
2307-
command:
2308-
- ci-operator
2309-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
2310-
imagePullPolicy: Always
2311-
name: ""
2312-
resources:
2313-
requests:
2314-
cpu: 10m
2315-
volumeMounts:
2316-
- mountPath: /secrets/gcs
2317-
name: gcs-credentials
2318-
readOnly: true
2319-
- mountPath: /secrets/manifest-tool
2320-
name: manifest-tool-local-pusher
2321-
readOnly: true
2322-
- mountPath: /etc/pull-secret
2323-
name: pull-secret
2324-
readOnly: true
2325-
- mountPath: /etc/report
2326-
name: result-aggregator
2327-
readOnly: true
2328-
serviceAccountName: ci-operator
2329-
volumes:
2330-
- name: manifest-tool-local-pusher
2331-
secret:
2332-
secretName: manifest-tool-local-pusher
2333-
- name: pull-secret
2334-
secret:
2335-
secretName: registry-pull-credentials
2336-
- name: result-aggregator
2337-
secret:
2338-
secretName: result-aggregator
2339-
trigger: (?m)^/test( | .* )periodics-images,?($|\s.*)
23402284
- agent: kubernetes
23412285
always_run: false
23422286
branches:

0 commit comments

Comments
 (0)