Skip to content

Commit

Permalink
OKD-103: Build the machine-os-images image for OKD/SCOS (#36453)
Browse files Browse the repository at this point in the history
* machine-os-images: Use OKD installer for OKD builds

The OKD installer from the `origin` namespace has to be used in the
build in order to actually pull the FCOS bootimage.

Fixes: okd-project/okd#1506

* machine-os-images: Add OKD/SCOS builds
  • Loading branch information
LorbusChris committed Feb 20, 2023
1 parent d3896b9 commit b28d4e0
Show file tree
Hide file tree
Showing 13 changed files with 616 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ base_images:
tag: base
ocp_4.13_installer:
name: "4.13"
namespace: ocp
namespace: origin
tag: installer
build_root:
from_repository: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
base_images:
base:
name: "4.12"
namespace: origin
tag: base
ocp_4.12_installer:
name: scos-4.12
namespace: origin
tag: installer
build_root:
from_repository: true
images:
- build_args:
- name: DIRECT_DOWNLOAD
value: "true"
dockerfile_path: Dockerfile
from: base
inputs:
ocp_4.12_installer:
as:
- registry.ci.openshift.org/ocp/4.12:installer
to: machine-os-images
promotion:
name: scos-4.12
namespace: origin
releases:
initial:
integration:
name: scos-4.12
namespace: origin
latest:
integration:
include_built_images: true
name: scos-4.12
namespace: origin
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
zz_generated_metadata:
branch: release-4.12
org: openshift
repo: machine-os-images
variant: okd-scos
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ base_images:
tag: base
ocp_4.12_installer:
name: "4.12"
namespace: ocp
namespace: origin
tag: installer
build_root:
from_repository: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
base_images:
base:
name: "4.13"
namespace: origin
tag: base
ocp_4.13_installer:
name: scos-4.13
namespace: origin
tag: installer
build_root:
from_repository: true
images:
- build_args:
- name: DIRECT_DOWNLOAD
value: "true"
dockerfile_path: Dockerfile
from: base
inputs:
ocp_4.13_installer:
as:
- registry.ci.openshift.org/ocp/4.13:installer
to: machine-os-images
promotion:
disabled: true
name: scos-4.13
namespace: origin
releases:
initial:
integration:
name: scos-4.13
namespace: origin
latest:
integration:
include_built_images: true
name: scos-4.13
namespace: origin
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
zz_generated_metadata:
branch: release-4.13
org: openshift
repo: machine-os-images
variant: okd-scos
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ base_images:
tag: base
ocp_4.13_installer:
name: "4.13"
namespace: ocp
namespace: origin
tag: installer
build_root:
from_repository: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
base_images:
base:
name: "4.14"
namespace: origin
tag: base
ocp_4.13_installer:
name: scos-4.14
namespace: origin
tag: installer
build_root:
from_repository: true
images:
- build_args:
- name: DIRECT_DOWNLOAD
value: "true"
dockerfile_path: Dockerfile
from: base
inputs:
ocp_4.13_installer:
as:
- registry.ci.openshift.org/ocp/4.13:installer
to: machine-os-images
promotion:
name: scos-4.14
namespace: origin
releases:
initial:
integration:
name: scos-4.14
namespace: origin
latest:
integration:
include_built_images: true
name: scos-4.14
namespace: origin
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
zz_generated_metadata:
branch: release-4.14
org: openshift
repo: machine-os-images
variant: okd-scos
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ base_images:
tag: base
ocp_4.13_installer:
name: "4.14"
namespace: ocp
namespace: origin
tag: installer
build_root:
from_repository: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,112 @@ postsubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
always_run: true
branches:
- ^release-4\.12$
cluster: build02
decorate: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci-operator.openshift.io/variant: okd-scos
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-machine-os-images-release-4.12-okd-scos-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --variant=okd-scos
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/push-secret
name: push-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: push-secret
secret:
secretName: registry-push-credentials-ci-central
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
always_run: true
branches:
- ^release-4\.12$
cluster: arm01
decorate: true
labels:
ci-operator.openshift.io/cluster: arm01
ci-operator.openshift.io/is-promotion: "true"
ci-operator.openshift.io/variant: okd-scos
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-machine-os-images-release-4.12-okd-scos-images-arm64
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --variant=okd-scos
command:
- ci-operator
image: registry.arm-build01.arm-build.devcluster.openshift.com/ci-arm64/ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/push-secret
name: push-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: push-secret
secret:
secretName: registry-push-credentials-ci-central
- name: result-aggregator
secret:
secretName: result-aggregator
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,56 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )okd-images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^release-4\.12$
- ^release-4\.12-
cluster: build02
context: ci/prow/okd-scos-images
decorate: true
labels:
ci-operator.openshift.io/variant: okd-scos
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-os-images-release-4.12-okd-scos-images
rerun_command: /test okd-scos-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=[release:latest]
- --variant=okd-scos
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Loading

0 comments on commit b28d4e0

Please sign in to comment.