[pitivi/sdk] x

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

commit aeca9dfa23de11dfe3c862de8163763782c363f4
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Tue Dec 8 00:05:51 2020 +0100

    x

 .gitlab-ci.yml | 13 +++++++------
 runner         |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45af47d05..e52cf5827 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - deploy
 
 variables:
-  MANIFEST: build/flatpak/org.pitivi.Pitivi.json
+  FLATPAK_BUILDER_CACHE: /root/flatpak-cache
   DBUS_ID: org.pitivi.Pitivi
   XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
   GST_DEBUG_NO_COLOR: "true"
@@ -15,18 +15,20 @@ pitivi:master:
   stage: tests_runner_image
   image: registry.gitlab.gnome.org/infrastructure/docker/buildah:latest
   script:
-    - export FLATPAK_BUILDER_CACHE="--state-dir=${HOME}/flatpak-cache"
     - export DOCKERIMAGE="registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.38"
+
+    # Debug
     # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
     - env
     - whoami
     - pwd
     - ls -al
+    - ls -al /root
 
     # Create an image with the flatpak cache populated.
     # This allows rebuilding the sandbox quickly when running the tests.
     - buildah login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
-    - buildah bud --isolation=chroot -f ./runner -t ${DOCKERIMAGE} ${DIR}
+    - buildah bud --isolation=chroot -f ./runner -t ${DOCKERIMAGE} ${DIR} --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}
     - buildah push ${DOCKERIMAGE}
   only:
     - triggers
@@ -43,10 +45,9 @@ build:
     BLACKLIST: >
       -b tests.test_effects.EffectsPropertiesManagerTest.test_dependent_properties
   script:
-    - export BUILDDIR=${HOME}/pitivi.git
+    - export BUILDDIR=/root/pitivi.git
     - export MANIFEST=${BUILDDIR}/build/flatpak/org.pitivi.Pitivi.json
     - export RUN_IN_SANDBOX="flatpak-builder --disable-rofiles-fuse --filesystem=${BUILDDIR} 
--filesystem=${CI_PROJECT_DIR} --env=PITIVI_DEVELOPMENT=1 --env=GST_DEBUG=2 --env=GST_DEBUG_NO_COLOR=true 
--run app ${MANIFEST}"
-    - export FLATPAK_BUILDER_CACHE="--state-dir=${HOME}/flatpak-cache"
     - export FLATPAK_REPO="${CI_PROJECT_DIR}/flatpak_repo"
 
     - env
@@ -57,7 +58,7 @@ build:
     - mkdir -p ${CI_PROJECT_DIR}
 
     - cd ${BUILDDIR}
-    - flatpak-builder --user --disable-rofiles-fuse ${FLATPAK_BUILDER_CACHE} --disable-download --ccache 
--repo=${FLATPAK_REPO} --force-clean app build/flatpak/org.pitivi.Pitivi.json --subject="Rolling update for 
pitivi master" --body="See ${CI_JOB_URL}"
+    - flatpak-builder --user --disable-rofiles-fuse --state-dir=${FLATPAK_BUILDER_CACHE} --ccache 
--disable-download --repo=${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}
diff --git a/runner b/runner
index 694e02b82..7374508d0 100644
--- a/runner
+++ b/runner
@@ -1,12 +1,12 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.38
 
 # This is just a temporary directory. It will be deleted at the end.
-ENV DIR=${HOME}/pitivi.git
+ENV DIR=/root/pitivi.git
 
 RUN git clone ${CI_PROJECT_URL}.git ${DIR} --single-branch -b ${CI_COMMIT_REF_NAME}
 
 # Create the flatpak sandbox
-RUN flatpak-builder --user --disable-rofiles-fuse ${DIR}/app ${DIR}/build/flatpak/org.pitivi.Pitivi.json 
${FLATPAK_BUILDER_CACHE} --ccache
+RUN flatpak-builder --user --disable-rofiles-fuse ${DIR}/app ${DIR}/build/flatpak/org.pitivi.Pitivi.json 
--state-dir=${FLATPAK_BUILDER_CACHE} --ccache
 
 # We're only interested in the flatpak cache being populated.
 RUN rm -rf ${DIR}