Skip to content

cmd-build: Stop using RUNVM_NONET=1 for now #1431

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

Closed
jlebon wants to merge 1 commit into from
Closed

cmd-build: Stop using RUNVM_NONET=1 for now #1431

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
3 changes: 2 additions & 1 deletion src/cmd-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ if [ ! -f "${workdir}"/builds/builds.json ] && [ ! -f "${fetch_stamp}" ] ; then
fi
# --cache-only is here since `fetch` is a separate verb
# shellcheck disable=SC2086
RUNVM_NONET=1 runcompose --cache-only ${FORCE} --add-metadata-from-json "${commitmeta_input_json}" \
# XXX: use RUNVM_NONET=1 here once all issues are ironed out
Copy link
Copy Markdown
Contributor

@arithx arithx May 7, 2020

Choose a reason for hiding this comment

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

Would be helpful to spell out the issues (or link to the rpm-ostree PR/issue that has more details).

runcompose --cache-only ${FORCE} --add-metadata-from-json "${commitmeta_input_json}" \
--write-composejson-to "${composejson}" \
--ex-write-lockfile-to "${lockfile_out}".tmp \
"${extra_compose_args[@]}"
Expand Down
3 changes: 2 additions & 1 deletion src/cmd-build-fast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ if [ -n "${projectdir}" ]; then
fi
tmpdir=${projectdir:-.}
qemu-img create -f qcow2 -o backing_file="${previous_builddir}/${previous_qemu}" "${tmpdir}/${fastbuild_qemu}" 20G
RUNVM_NONET=1 runvm -drive if=virtio,id=target,format=qcow2,file="${fastbuild_qemu}",cache=unsafe -- \
# XXX: use RUNVM_NONET=1 here once all issues are ironed out
runvm -drive if=virtio,id=target,format=qcow2,file="${fastbuild_qemu}",cache=unsafe -- \
/usr/lib/coreos-assembler/offline-update-impl "${workdir}/tmp/repo" "${commit}"
if [ -n "${projectdir}" ]; then
echo "Created: ${fastbuild_qemu}"
Expand Down