Skip to content

Commit 0e90ac9

Browse files
committed
remove old OCB jobs and images
1 parent e91b780 commit 0e90ac9

File tree

2 files changed

+0
-250
lines changed

2 files changed

+0
-250
lines changed

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,11 @@ images:
7676
- dockerfile_path: test/custom-os-images/Containerfile.rhel-coreos-10
7777
from: ocp_os_rhel_10
7878
to: custom-os-image-rhel-10
79-
- dockerfile_literal: |
80-
FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
81-
to: zacks-toolbox
8279
promotion:
8380
to:
8481
- excluded_images:
8582
- custom-os-image-rhel-9
8683
- custom-os-image-rhel-10
87-
- zacks-toolbox
8884
name: "4.21"
8985
namespace: ocp
9086
releases:
@@ -582,102 +578,6 @@ tests:
582578
env:
583579
PROJECT_NAME: machine-config-operator
584580
workflow: openshift-ci-security
585-
- always_run: false
586-
as: e2e-aws-ovn-upgrade-ocb-techpreview
587-
optional: true
588-
steps:
589-
cluster_profile: aws
590-
env:
591-
FEATURE_SET: TechPreviewNoUpgrade
592-
test:
593-
- as: get-prelayering-rpmostree-status
594-
commands: |-
595-
#!/usr/bin/env bash
596-
set -xeuo pipefail
597-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
598-
from: zacks-toolbox
599-
resources:
600-
requests:
601-
cpu: 100m
602-
- as: enable-layering
603-
commands: |-
604-
#!/usr/bin/env bash
605-
set -xeuo pipefail
606-
onclustertesting version
607-
onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/main/test/e2e-ocl/Containerfile.cowsay)
608-
from: zacks-toolbox
609-
resources:
610-
requests:
611-
cpu: 100m
612-
- as: get-postlayering-rpmostree-status
613-
commands: |-
614-
#!/usr/bin/env bash
615-
set -xeuo pipefail
616-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
617-
from: zacks-toolbox
618-
resources:
619-
requests:
620-
cpu: 100m
621-
- ref: openshift-e2e-test
622-
- as: get-posttest-rpmostree-status
623-
commands: |-
624-
#!/usr/bin/env bash
625-
set -xeuo pipefail
626-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
627-
from: zacks-toolbox
628-
resources:
629-
requests:
630-
cpu: 100m
631-
workflow: openshift-upgrade-aws
632-
timeout: 5h0m0s
633-
- always_run: false
634-
as: e2e-aws-ovn-ocb-techpreview
635-
optional: true
636-
steps:
637-
cluster_profile: aws-2
638-
env:
639-
FEATURE_SET: TechPreviewNoUpgrade
640-
test:
641-
- as: get-prelayering-rpmostree-status
642-
commands: |-
643-
#!/usr/bin/env bash
644-
set -xeuo pipefail
645-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
646-
from: zacks-toolbox
647-
resources:
648-
requests:
649-
cpu: 100m
650-
- as: enable-layering
651-
commands: |-
652-
#!/usr/bin/env bash
653-
set -xeuo pipefail
654-
onclustertesting version
655-
onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/main/test/e2e-ocl/Containerfile.cowsay)
656-
from: zacks-toolbox
657-
resources:
658-
requests:
659-
cpu: 100m
660-
- as: get-postlayering-rpmostree-status
661-
commands: |-
662-
#!/usr/bin/env bash
663-
set -xeuo pipefail
664-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
665-
from: zacks-toolbox
666-
resources:
667-
requests:
668-
cpu: 100m
669-
- ref: openshift-e2e-test
670-
- as: get-posttest-rpmostree-status
671-
commands: |-
672-
#!/usr/bin/env bash
673-
set -xeuo pipefail
674-
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
675-
from: zacks-toolbox
676-
resources:
677-
requests:
678-
cpu: 100m
679-
workflow: openshift-e2e-aws
680-
timeout: 5h0m0s
681581
- as: verify-deps
682582
steps:
683583
env:

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml

Lines changed: 0 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -504,81 +504,6 @@ presubmits:
504504
secret:
505505
secretName: result-aggregator
506506
trigger: (?m)^/test( | .* )e2e-aws-ovn-fips-op,?($|\s.*)
507-
- agent: kubernetes
508-
always_run: false
509-
branches:
510-
- ^main$
511-
- ^main-
512-
cluster: build10
513-
context: ci/prow/e2e-aws-ovn-ocb-techpreview
514-
decorate: true
515-
decoration_config:
516-
timeout: 5h0m0s
517-
labels:
518-
ci-operator.openshift.io/cloud: aws
519-
ci-operator.openshift.io/cloud-cluster-profile: aws-2
520-
ci.openshift.io/generator: prowgen
521-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
522-
name: pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-ocb-techpreview
523-
optional: true
524-
rerun_command: /test e2e-aws-ovn-ocb-techpreview
525-
spec:
526-
containers:
527-
- args:
528-
- --gcs-upload-secret=/secrets/gcs/service-account.json
529-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
530-
- --lease-server-credentials-file=/etc/boskos/credentials
531-
- --report-credentials-file=/etc/report/credentials
532-
- --secret-dir=/secrets/ci-pull-credentials
533-
- --target=e2e-aws-ovn-ocb-techpreview
534-
command:
535-
- ci-operator
536-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
537-
imagePullPolicy: Always
538-
name: ""
539-
resources:
540-
requests:
541-
cpu: 10m
542-
volumeMounts:
543-
- mountPath: /etc/boskos
544-
name: boskos
545-
readOnly: true
546-
- mountPath: /secrets/ci-pull-credentials
547-
name: ci-pull-credentials
548-
readOnly: true
549-
- mountPath: /secrets/gcs
550-
name: gcs-credentials
551-
readOnly: true
552-
- mountPath: /secrets/manifest-tool
553-
name: manifest-tool-local-pusher
554-
readOnly: true
555-
- mountPath: /etc/pull-secret
556-
name: pull-secret
557-
readOnly: true
558-
- mountPath: /etc/report
559-
name: result-aggregator
560-
readOnly: true
561-
serviceAccountName: ci-operator
562-
volumes:
563-
- name: boskos
564-
secret:
565-
items:
566-
- key: credentials
567-
path: credentials
568-
secretName: boskos-credentials
569-
- name: ci-pull-credentials
570-
secret:
571-
secretName: ci-pull-credentials
572-
- name: manifest-tool-local-pusher
573-
secret:
574-
secretName: manifest-tool-local-pusher
575-
- name: pull-secret
576-
secret:
577-
secretName: registry-pull-credentials
578-
- name: result-aggregator
579-
secret:
580-
secretName: result-aggregator
581-
trigger: (?m)^/test( | .* )e2e-aws-ovn-ocb-techpreview,?($|\s.*)
582507
- agent: kubernetes
583508
always_run: false
584509
branches:
@@ -800,81 +725,6 @@ presubmits:
800725
secret:
801726
secretName: result-aggregator
802727
trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade-ipsec,?($|\s.*)
803-
- agent: kubernetes
804-
always_run: false
805-
branches:
806-
- ^main$
807-
- ^main-
808-
cluster: build10
809-
context: ci/prow/e2e-aws-ovn-upgrade-ocb-techpreview
810-
decorate: true
811-
decoration_config:
812-
timeout: 5h0m0s
813-
labels:
814-
ci-operator.openshift.io/cloud: aws
815-
ci-operator.openshift.io/cloud-cluster-profile: aws
816-
ci.openshift.io/generator: prowgen
817-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
818-
name: pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-upgrade-ocb-techpreview
819-
optional: true
820-
rerun_command: /test e2e-aws-ovn-upgrade-ocb-techpreview
821-
spec:
822-
containers:
823-
- args:
824-
- --gcs-upload-secret=/secrets/gcs/service-account.json
825-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
826-
- --lease-server-credentials-file=/etc/boskos/credentials
827-
- --report-credentials-file=/etc/report/credentials
828-
- --secret-dir=/secrets/ci-pull-credentials
829-
- --target=e2e-aws-ovn-upgrade-ocb-techpreview
830-
command:
831-
- ci-operator
832-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
833-
imagePullPolicy: Always
834-
name: ""
835-
resources:
836-
requests:
837-
cpu: 10m
838-
volumeMounts:
839-
- mountPath: /etc/boskos
840-
name: boskos
841-
readOnly: true
842-
- mountPath: /secrets/ci-pull-credentials
843-
name: ci-pull-credentials
844-
readOnly: true
845-
- mountPath: /secrets/gcs
846-
name: gcs-credentials
847-
readOnly: true
848-
- mountPath: /secrets/manifest-tool
849-
name: manifest-tool-local-pusher
850-
readOnly: true
851-
- mountPath: /etc/pull-secret
852-
name: pull-secret
853-
readOnly: true
854-
- mountPath: /etc/report
855-
name: result-aggregator
856-
readOnly: true
857-
serviceAccountName: ci-operator
858-
volumes:
859-
- name: boskos
860-
secret:
861-
items:
862-
- key: credentials
863-
path: credentials
864-
secretName: boskos-credentials
865-
- name: ci-pull-credentials
866-
secret:
867-
secretName: ci-pull-credentials
868-
- name: manifest-tool-local-pusher
869-
secret:
870-
secretName: manifest-tool-local-pusher
871-
- name: pull-secret
872-
secret:
873-
secretName: registry-pull-credentials
874-
- name: result-aggregator
875-
secret:
876-
secretName: result-aggregator
877-
trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade-ocb-techpreview,?($|\s.*)
878728
- agent: kubernetes
879729
always_run: false
880730
branches:

0 commit comments

Comments
 (0)