[gnome-build-meta/abderrahim/buildstream-conf] .gitlab-ci: use two different buildstream config files

[Marge Bot <marge-bot src gnome org>]

commit 2017b410684760671df50a7223ab139257348929
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Feb 12 09:11:19 2021 +0100

    .gitlab-ci: use two different buildstream config files
    
    CI was assuming the config file only contains the push remote, which is not
    the case
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1020>

 .gitlab-ci.yml                            |  4 ++--
 .gitlab-ci/buildstream-nopush.conf        | 19 +++++++++++++++++++
 build.conf => .gitlab-ci/buildstream.conf |  0
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d47f8cf2..b1dfee51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
   GET_SOURCES_ATTEMPTS: 3
   BST_STRICT: '--no-strict'
   BST_TRACK_TAGS: 'False'
-  BST_NO_PUSH: "bst $BST_STRICT --log-file logs/build.log --colors"
-  BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
+  BST_NO_PUSH: "bst $BST_STRICT --config .gitlab-ci/buildstream-nopush.conf --log-file logs/build.log 
--colors"
+  BST: "bst $BST_STRICT --config .gitlab-ci/buildstream.conf --log-file logs/build.log --colors"
   FLATPAK_BRANCH: master
 
 stages:
diff --git a/.gitlab-ci/buildstream-nopush.conf b/.gitlab-ci/buildstream-nopush.conf
new file mode 100644
index 00000000..840877b4
--- /dev/null
+++ b/.gitlab-ci/buildstream-nopush.conf
@@ -0,0 +1,19 @@
+# This is the buildstream configuration used for CI
+
+# The log directory
+logdir: logs
+
+# build area and artifacts
+builddir: /buildstream-cache/build
+artifactdir: /buildstream-cache/artifacts
+
+# and sources in the dedicated volume
+sourcedir: /cache/buildstream/sources
+
+# Keep building and find all the errors
+scheduler:
+  on-error: continue
+
+# Get a lot of output in case of errors
+logging:
+  error-lines: 80
diff --git a/build.conf b/.gitlab-ci/buildstream.conf
similarity index 100%
rename from build.conf
rename to .gitlab-ci/buildstream.conf