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>

diff --git a/ci/integration-template.yml b/ci/integration-template.yml
index 1ccf64f4c15d4a8f09f27ed43552de0a528cf396..166445527ced7e47d1bda8b7847144baa45894f1 100644 (file)
--- 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: