-
Notifications
You must be signed in to change notification settings - Fork 2.2k
openshift/os: start building scos node images #62296
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| base_images: | ||
| ocp_builder_stream9: | ||
| name: builder | ||
| namespace: ocp | ||
| tag: stream9 | ||
| images: | ||
| - build_args: | ||
| - name: OPENSHIFT_CI | ||
| value: "1" | ||
| dockerfile_path: Containerfile | ||
| to: stream-coreos | ||
| - build_args: | ||
| - name: VARIANT | ||
| value: okd-c9s | ||
| dockerfile_path: extensions/Dockerfile | ||
| inputs: | ||
| ocp_builder_stream9: | ||
| as: | ||
| - registry.access.redhat.com/ubi9/ubi:latest | ||
| stream-coreos: | ||
| as: | ||
| - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest | ||
| to: stream-coreos-extensions | ||
| promotion: | ||
| to: | ||
| - name: scos-4.19 | ||
| namespace: origin | ||
| releases: | ||
| latest: | ||
| integration: | ||
| include_built_images: true | ||
| name: scos-4.19 | ||
| namespace: origin | ||
| resources: | ||
| '*': | ||
| requests: | ||
| cpu: 100m | ||
| memory: 200Mi | ||
| tests: | ||
| - always_run: false | ||
| as: e2e-aws-ovn | ||
| optional: true | ||
| skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ | ||
| steps: | ||
| cluster_profile: aws | ||
| workflow: openshift-e2e-aws | ||
| zz_generated_metadata: | ||
| branch: master | ||
| org: openshift | ||
| repo: os | ||
| variant: okd-scos | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will build the okd node image on top of rhel-coreos, which is unwanted.
We should use the c9s base image but we don't publish it to registry.ci as of now.
We can change that though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AIUI according to https://docs.ci.openshift.org/docs/architecture/images/#ci-images, the extensions will be built on top of the previously built
stream-coreosimage which is substituted for theregistry.ci.openshift.org/rhcos-devel/rhel-coreos:latest. This is similar to what is done for rhel-coreosThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jbtrystram this is now ready to go. Do you have any other concerns before approval?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default in the
Containerfileof the os repo is a c9s base image (quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos) - and that is used to build the stream-coreos image which is then used to build the extensions. hope this makes it clear.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably use the same default in both TBH, but no need to block on that.