Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -50,7 +46,6 @@ promotion:
to:
- excluded_images:
- e2e-test-registry
- test-catalog
name: 4.19-priv
namespace: ocp-private
releases:
Expand Down Expand Up @@ -120,8 +115,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -51,7 +47,6 @@ promotion:
- disabled: true
excluded_images:
- e2e-test-registry
- test-catalog
name: 4.19-priv
namespace: ocp-private
releases:
Expand Down Expand Up @@ -121,8 +116,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -50,7 +46,6 @@ promotion:
to:
- excluded_images:
- e2e-test-registry
- test-catalog
name: 4.20-priv
namespace: ocp-private
releases:
Expand Down Expand Up @@ -120,8 +115,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -49,7 +45,6 @@ promotion:
to:
- excluded_images:
- e2e-test-registry
- test-catalog
name: "4.19"
namespace: ocp
releases:
Expand Down Expand Up @@ -119,8 +114,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -50,7 +46,6 @@ promotion:
- disabled: true
excluded_images:
- e2e-test-registry
- test-catalog
name: "4.19"
namespace: ocp
releases:
Expand Down Expand Up @@ -120,8 +115,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
to: olm-catalogd
- context_dir: catalogd/testdata/catalogs
dockerfile_path: test-catalog.Dockerfile
from: src
to: test-catalog
- dockerfile_path: openshift/operator-controller.Dockerfile
inputs:
ocp_4.19_base-rhel9:
Expand All @@ -49,7 +45,6 @@ promotion:
to:
- excluded_images:
- e2e-test-registry
- test-catalog
name: "4.20"
namespace: ocp
releases:
Expand Down Expand Up @@ -119,8 +114,6 @@ tests:
dependencies:
- env: E2E_REGISTRY_IMAGE
name: e2e-test-registry
- env: TEST_CATALOG_IMAGE
name: test-catalog
from: src
resources:
requests:
Expand Down