Skip to content
Open

okd 5.0 #79642

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
@@ -1,30 +1,47 @@
base_images:
origin_scos-4.22_base-stream9:
name: scos-4.22
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.25-openshift-5.0
ocp_builder_rhel-9-openshift-nodejs-base-5.0.art:
name: builder
namespace: ocp
tag: rhel-9-openshift-nodejs-base-5.0.art
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: apps/assisted-disconnected-ui/Containerfile.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- proxy-build
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
ocp_builder_rhel-9-openshift-nodejs-base-5.0.art:
as:
- ui-build
- registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.22
to: agent-installer-ui
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
base_images:
origin_scos-4.22_base-stream9:
name: scos-4.22
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
from_repository: true
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: images/Dockerfile.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
to: agent-installer-utils
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
54 changes: 54 additions & 0 deletions ci-operator/config/openshift/api/openshift-api-main__okd-scos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
base_images:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: Dockerfile.ocp
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
to: cluster-config-api
promotion:
to:
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-5.0
namespace: origin
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- always_run: false
as: e2e-aws-ovn
optional: true
steps:
cluster_profile: openshift-org-aws
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: main
org: openshift
repo: api
variant: okd-scos
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
base_images:
origin_scos-4.22_base-stream9:
name: scos-4.22
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: Dockerfile.openshift
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23
to: apiserver-network-proxy
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
base_images:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.22
origin_scos-4.22_base-stream9:
name: scos-4.22
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: ./Dockerfile.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
to: agent-installer-node-agent
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
base_images:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.22
origin_scos-4.22_base-stream9:
name: scos-4.22
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
to: agent-installer-csr-approver
- build_args:
- name: TAGS
value: scos
dockerfile_path: ./Dockerfile.assisted-installer.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
to: agent-installer-orchestrator
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
base_images:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.22
origin_scos-4.22_base-stream9:
name: scos-4.22
tag: rhel-9-golang-1.25-openshift-5.0
origin_scos-5.0_base-stream9:
name: scos-5.0
namespace: origin
tag: base-stream9
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-5.0
images:
items:
- build_args:
- name: TAGS
value: scos
dockerfile_path: ./Dockerfile.assisted-service.ocp
from: origin_scos-4.22_base-stream9
from: origin_scos-5.0_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.24-openshift-4.22:
ocp_builder_rhel-9-golang-1.25-openshift-5.0:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
to: agent-installer-api-server
promotion:
to:
- name: scos-4.22
- name: scos-5.0
namespace: origin
releases:
latest:
integration:
include_built_images: true
name: scos-4.22
name: scos-5.0
namespace: origin
resources:
'*':
Expand Down
Loading