Skip to content

Honor OLM's upstream .ci-operator.yaml #26550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 2, 2022
Merged

Honor OLM's upstream .ci-operator.yaml #26550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...ator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ base_images:
namespace: ocp
tag: rhel-8-golang-1.16-openshift-4.10
build_root:
project_image:
context_dir: .
dockerfile_path: base.Dockerfile
from_repository: true
images:
- dockerfile_path: operator-lifecycle-manager.Dockerfile
from: base
Expand Down
2 changes: 0 additions & 2 deletions ...openshift/operator-framework-olm/openshift-operator-framework-olm-master-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ postsubmits:
- ^master$
cluster: build02
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
Expand Down
18 changes: 0 additions & 18 deletions .../openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ presubmits:
cluster: build02
context: ci/prow/e2e-aws-console-olm
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
Expand Down Expand Up @@ -82,8 +80,6 @@ presubmits:
cluster: build02
context: ci/prow/e2e-aws-olm
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
Expand Down Expand Up @@ -156,8 +152,6 @@ presubmits:
cluster: build02
context: ci/prow/e2e-gcp
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcp
Expand Down Expand Up @@ -234,8 +228,6 @@ presubmits:
cluster: build02
context: ci/prow/e2e-upgrade
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: azure4
ci-operator.openshift.io/cloud-cluster-profile: azure4
Expand Down Expand Up @@ -308,8 +300,6 @@ presubmits:
cluster: build02
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -358,8 +348,6 @@ presubmits:
cluster: build02
context: ci/prow/unit-api
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -407,8 +395,6 @@ presubmits:
cluster: build02
context: ci/prow/unit-olm
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -456,8 +442,6 @@ presubmits:
cluster: build02
context: ci/prow/unit-registry
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -505,8 +489,6 @@ presubmits:
cluster: build02
context: ci/prow/verify
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down