[PATCH 2/2] 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(a)redhat.com&gt; --- ci/integration-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 1ccf64f4c1..166445527c 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -1,4 +1,5 @@ .qemu-build-template: &qemu-build-template + - pushd "$SCRATCH_DIR" - git clone --depth 1 https://gitlab.com/qemu-project/qemu.git - cd qemu # @@ -22,6 +23,8 @@ # other user - sudo git config --global --add safe.directory "$SCRATCH_DIR/qemu" - sudo make install + - sudo restorecon -R /usr + - popd .collect-logs: &collect-logs @@ -83,10 +86,7 @@ .integration_tests_upstream_qemu: before_script: - !reference [.integration_tests, before_script] - - pushd "$SCRATCH_DIR" - *qemu-build-template - - sudo restorecon -R /usr - - popd .integration_tests_upstream_qemu_prebuilt_env: extends: -- 2.43.0