[pitivi/sdk] x

[Alexandru Băluț <alexbalut src gnome org>]

commit a1b8ac29ef493c40e7208e3bc3539d82b7d07e9f
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Mon Dec 21 00:13:58 2020 +0100

    x

 .gitlab-ci.yml | 23 +++++++----------------
 runner         |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3e195b37..51375f3f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - deploy
 
 variables:
-  FLATPAK_BUILDER_CACHE: /root/pitivi-flatpak-cache
+  FLATPAK_BUILDER_CACHE: /build/pitivi-flatpak-cache
   DBUS_ID: org.pitivi.Pitivi
   XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
   GST_DEBUG_NO_COLOR: "true"
@@ -24,15 +24,14 @@ pitivi:master:
     - whoami
     - pwd
     - ls -al
-    - ls -al /root
 
     - buildah login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
 
     # Create an image with the flatpak-builder cache populated.
     # This allows rebuilding the sandbox quickly when running the tests.
-    - export DOCKERIMAGE="registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.38"
-    - buildah bud --isolation=chroot --format=docker --build-arg CI_PROJECT_URL=${CI_PROJECT_URL} 
--build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} --build-arg 
FLATPAK_BUILDER_CACHE=${FLATPAK_BUILDER_CACHE} -f ./runner -t ${DOCKERIMAGE} ${DIR}
-    - buildah push ${DOCKERIMAGE}
+    - export IMAGE="registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.38"
+    - buildah bud --isolation=chroot --format=docker --build-arg CI_PROJECT_URL=${CI_PROJECT_URL} 
--build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} --build-arg 
FLATPAK_BUILDER_CACHE=${FLATPAK_BUILDER_CACHE} -f ./runner -t ${IMAGE}
+    - buildah push ${IMAGE}
   only:
     - triggers
     - schedules
@@ -53,25 +52,17 @@ tests:
     - whoami
     - pwd
     - ls -al
-    - ls -al /root
+    - ls -al /build
 
-    - export REPO_DIR=/root/pitivi
-    - export RUN_IN_SANDBOX="flatpak-builder --disable-rofiles-fuse --filesystem=${REPO_DIR} 
--filesystem=${CI_PROJECT_DIR} --env=PITIVI_DEVELOPMENT=1 --env=GST_DEBUG=2 --env=GST_DEBUG_NO_COLOR=true 
--run app ${REPO_DIR}/build/flatpak/org.pitivi.Pitivi.json"
+    - export RUN_IN_SANDBOX="flatpak-builder --disable-rofiles-fuse --filesystem=${CI_PROJECT_DIR} 
--env=PITIVI_DEVELOPMENT=1 --env=GST_DEBUG=2 --env=GST_DEBUG_NO_COLOR=true --run app 
${CI_PROJECT_DIR}/build/flatpak/org.pitivi.Pitivi.json"
 
-    # Working around the fact that flatpak-builder *requires* the cache dir
-    # to be on the same filesystem as the build dir.
-    # CI_PROJECT_DIR is most likely /builds/GNOME/pitivi
-    - mv ${CI_PROJECT_DIR} ${REPO_DIR}
-    - mkdir -p ${CI_PROJECT_DIR}
-
-    - cd ${REPO_DIR}
+    - cd ${CI_PROJECT_DIR}
     - flatpak-builder --user --disable-rofiles-fuse --state-dir=${FLATPAK_BUILDER_CACHE} --ccache 
--disable-download --repo=${CI_PROJECT_DIR}/flatpak_repo --force-clean app 
build/flatpak/org.pitivi.Pitivi.json --subject="Rolling update for pitivi master" --body="See ${CI_JOB_URL}"
     - ${RUN_IN_SANDBOX} meson mesonbuild/
     - ${RUN_IN_SANDBOX} ninja -C mesonbuild/
     - xvfb-run -n 32 -s "-screen 0 640x480x24" ${RUN_IN_SANDBOX} gst-validate-launcher 
${PWD}/tests/ptv_testsuite.py --dump-on-failure --timeout-factor 4 --xunit-file ${XUNIT_PATH} 
--logs-dir=${CI_PROJECT_DIR}/tests-logs ${BLACKLIST}
 
     # For some reason GitLab fails to upload directories
-    - cd ${CI_PROJECT_DIR}/
     - tar czf tests-logs.tar.gz tests-logs/
     - tar cf flatpak_repo.tar flatpak_repo/
   cache:
diff --git a/runner b/runner
index ef032aa46..7910408e6 100644
--- a/runner
+++ b/runner
@@ -5,7 +5,7 @@ ARG CI_COMMIT_REF_NAME
 ARG FLATPAK_BUILDER_CACHE
 
 # This is just a temporary directory. It will be deleted at the end.
-ENV REPO_DIR=/root/tmp-pitivi
+ENV REPO_DIR=/tmp/pitivi
 
 RUN git clone ${CI_PROJECT_URL}.git --single-branch ${REPO_DIR} -b ${CI_COMMIT_REF_NAME}