mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
ci: Do more as part of .qemu-build-template
Entering $SCRATCH_DIR, going back to the original directory and setting SELinux labels for the newly-installed QEMU binaries are all steps that logically belong to this template rather than its callers. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
9cf0faac48
commit
10042f0253
@ -1,4 +1,5 @@
|
|||||||
.qemu-build-template: &qemu-build-template
|
.qemu-build-template: &qemu-build-template
|
||||||
|
- pushd "$SCRATCH_DIR"
|
||||||
- git clone --depth 1 https://gitlab.com/qemu-project/qemu.git
|
- git clone --depth 1 https://gitlab.com/qemu-project/qemu.git
|
||||||
- cd qemu
|
- cd qemu
|
||||||
#
|
#
|
||||||
@ -22,6 +23,8 @@
|
|||||||
# other user
|
# other user
|
||||||
- sudo git config --global --add safe.directory "$SCRATCH_DIR/qemu"
|
- sudo git config --global --add safe.directory "$SCRATCH_DIR/qemu"
|
||||||
- sudo make install
|
- sudo make install
|
||||||
|
- sudo restorecon -R /usr
|
||||||
|
- popd
|
||||||
|
|
||||||
|
|
||||||
.collect-logs: &collect-logs
|
.collect-logs: &collect-logs
|
||||||
@ -83,10 +86,7 @@
|
|||||||
.integration_tests_upstream_qemu:
|
.integration_tests_upstream_qemu:
|
||||||
before_script:
|
before_script:
|
||||||
- !reference [.integration_tests, before_script]
|
- !reference [.integration_tests, before_script]
|
||||||
- pushd "$SCRATCH_DIR"
|
|
||||||
- *qemu-build-template
|
- *qemu-build-template
|
||||||
- sudo restorecon -R /usr
|
|
||||||
- popd
|
|
||||||
|
|
||||||
.integration_tests_upstream_qemu_prebuilt_env:
|
.integration_tests_upstream_qemu_prebuilt_env:
|
||||||
extends:
|
extends:
|
||||||
|
Loading…
Reference in New Issue
Block a user