Skip to content

openshift/kubernetes: stop modifying machine-os-content #49156

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
Mar 6, 2024
Merged

openshift/kubernetes: stop modifying machine-os-content #49156

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
14 changes: 0 additions & 14 deletions ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.16"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -146,7 +133,6 @@ promotion:
- additional_images:
artifacts: artifacts
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.16"
namespace: ocp
Expand Down
14 changes: 0 additions & 14 deletions ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.16"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -147,7 +134,6 @@ promotion:
artifacts: artifacts
disabled: true
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.16"
namespace: ocp
Expand Down
14 changes: 0 additions & 14 deletions ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.17"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.17"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -146,7 +133,6 @@ promotion:
- additional_images:
artifacts: artifacts
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.17"
namespace: ocp
Expand Down