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

Jump to bottom

[rhcos-4.16] osbuild: make building with OSBuild the default #3820

Merged
merged 2 commits into from
Jun 13, 2024
Merged

[rhcos-4.16] osbuild: make building with OSBuild the default #3820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5728387
osbuild: make building with OSBuild the default
dustymabe May 10, 2024
933c9d8
Revert "ci: Use scos (at least for now)"
jlebon May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/prow-rhcos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ esac
export COSA_SKIP_OVERLAY=1
# Create a temporary cosa workdir
cd "$(mktemp -d)"
cosa init --variant scos --transient -b "${RHCOS_BRANCH}" https://github.com/openshift/os
cosa init --transient -b "${RHCOS_BRANCH}" https://github.com/openshift/os
# Use a COSA specifc test entry point to focus on tests relevant for COSA
exec src/config/ci/prow-entrypoint.sh rhcos-cosa-prow-pr-ci
4 changes: 2 additions & 2 deletions src/cmd-buildextend-metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ if [ "${image_type}" == "qemu" ] || [ "${image_type}" == "metal" ] || [ "${image
fi
fi

# Run with OSBuild if it's supported and requested, otherwise use create_disk
if [ "${OSBUILD_SUPPORTED:-}" != "" ] && [ "${COSA_USE_OSBUILD:-}" != "" ]; then
# Run with OSBuild if it's supported, unless it is explicitly disabled with COSA_USE_OSBUILD=0
if [ "${OSBUILD_SUPPORTED:-}" != "" ] && [ "${COSA_USE_OSBUILD:-}" != "0" ]; then
# In the jenkins pipelines we build the qemu image first and that operation
# will do a lot of the same work required for later artifacts (metal, metal4k, etc)
# so we want the cached output from that run to persist. The later artifacts get
Expand Down