Skip to content
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

build rhcos extensions image nightly #30351

Merged
merged 1 commit into from
Jul 11, 2022
Merged

build rhcos extensions image nightly #30351

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
26 changes: 22 additions & 4 deletions ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,16 @@ images:
- destination_dir: magic
source_path: /tmp/cosa
to: machine-os-oci-content
- dockerfile_path: extensions/Dockerfile
inputs:
machine-os-oci-content:
as:
- registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest
to: rhcos-extensions-8.6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now I would prefer that we don't introduce versions everywhere that we would have to update / remove after and use generic names until we've figure out how we will support RHCOS 9.0. I'll make a PR.

promotion:
additional_images:
rhel-coreos: machine-os-oci-content
rhel-coreos-extensions: rhcos-extensions-8.6
excluded_images:
- '*'
namespace: rhcos-devel
Expand All @@ -124,11 +131,22 @@ resources:
cpu: 2000m
memory: 4Gi
tests:
- as: validate-machine-os-oci-image
commands: cat /etc/os-release
container:
from: machine-os-oci-content
- as: validate-built-images
cron: '@daily'
steps:
test:
- as: validate-rhcos-base-image
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewer: I combined these under a single test so we have a single job that builds both images. Otherwise, the image builds could run at different times and may get out of sync.

commands: cat /etc/os-release
from: machine-os-oci-content
resources:
requests:
cpu: 100m
- as: validate-rhcos-extensions-image
commands: cat /etc/os-release
from: rhcos-extensions-8.6
resources:
requests:
cpu: 100m
zz_generated_metadata:
branch: master
org: openshift
Expand Down
13 changes: 10 additions & 3 deletions ci-operator/jobs/openshift/os/openshift-os-master-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
periodics:
- agent: kubernetes
cluster: build01
cron: 38 0 * * *
cron: 19 23 * * *
decorate: true
decoration_config:
skip_cloning: true
Expand All @@ -13,14 +13,15 @@ periodics:
ci-operator.openshift.io/variant: periodic
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-os-master-periodic-validate-machine-os-oci-image
name: periodic-ci-openshift-os-master-periodic-validate-built-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=validate-machine-os-oci-image
- --secret-dir=/secrets/ci-pull-credentials
- --target=validate-built-images
- --variant=periodic
command:
- ci-operator
Expand All @@ -31,6 +32,9 @@ periodics:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
Expand All @@ -42,6 +46,9 @@ periodics:
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: pull-secret
secret:
secretName: registry-pull-credentials
Expand Down
1 change: 1 addition & 0 deletions ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ postsubmits:
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=machine-os-oci-content
- --target=rhcos-extensions-8.6
- --variant=periodic
command:
- ci-operator
Expand Down
1 change: 1 addition & 0 deletions ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ presubmits:
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=machine-os-oci-content
- --target=rhcos-extensions-8.6
- --variant=periodic
command:
- ci-operator
Expand Down