Skip to content

Commit

Permalink
osbuild: make building with OSBuild the default
Browse files Browse the repository at this point in the history
Now all of our streams are ready to be switched to OSBuild and RHCOS
latest streams are also switched over. Let's make it the default so
we don't have to set COSA_USE_OSBUILD=1 any longer. This also has
the side effect of making all CI run with OSBUild now too.

(cherry picked from commit 4d94dc3)

4.16 is already being built with `COSA_USE_OSBUILD` today.
Cherry-picking this will allow us to clean up our pipecfg.
  • Loading branch information
dustymabe authored and jlebon committed Jun 12, 2024
1 parent 3717695 commit 5728387
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/cmd-buildextend-metal
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

0 comments on commit 5728387

Please sign in to comment.