Skip to content

WRKLDS-1251: Remove temporarily must-gather-base image from oc presubmits #51578

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-bot merged 1 commit into from
May 2, 2024
+0 −45
Merged

WRKLDS-1251: Remove temporarily must-gather-base image from oc presubmits #51578

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
15 changes: 0 additions & 15 deletions ci-operator/config/openshift/oc/openshift-oc-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
must-gather-base:
name: "4.16"
namespace: ocp
tag: must-gather
ocp_4.16_base:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -69,16 +65,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: tests
- dockerfile_path: images/cli/Dockerfile.rhel
from: must-gather-base
inputs:
ocp_builder_rhel-8-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: must-gather
- context_dir: images/deployer
dockerfile_path: Dockerfile.rhel
from: cli
Expand All @@ -103,7 +89,6 @@ promotion:
oc-rpms: rpms
excluded_images:
- tests
- must-gather
- oc-base-with-rpms
name: "4.16"
namespace: ocp
Expand Down
15 changes: 0 additions & 15 deletions ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
must-gather-base:
name: "4.16"
namespace: ocp
tag: must-gather
ocp_4.16_base:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -69,16 +65,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: tests
- dockerfile_path: images/cli/Dockerfile.rhel
from: must-gather-base
inputs:
ocp_builder_rhel-8-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: must-gather
- context_dir: images/deployer
dockerfile_path: Dockerfile.rhel
from: cli
Expand All @@ -104,7 +90,6 @@ promotion:
disabled: true
excluded_images:
- tests
- must-gather
- oc-base-with-rpms
name: "4.16"
namespace: ocp
Expand Down
15 changes: 0 additions & 15 deletions ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
must-gather-base:
name: "4.17"
namespace: ocp
tag: must-gather
ocp_4.16_base:
name: "4.17"
namespace: ocp
Expand Down Expand Up @@ -69,16 +65,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: tests
- dockerfile_path: images/cli/Dockerfile.rhel
from: must-gather-base
inputs:
ocp_builder_rhel-8-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: must-gather
- context_dir: images/deployer
dockerfile_path: Dockerfile.rhel
from: cli
Expand All @@ -103,7 +89,6 @@ promotion:
oc-rpms: rpms
excluded_images:
- tests
- must-gather
- oc-base-with-rpms
name: "4.17"
namespace: ocp
Expand Down