From 5e189422064c9bb85dfa89eb96772fa18f258396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 25 Oct 2017 14:50:49 +0100
Subject: Revert "Remove BuildStream update task"

We do want to control what version of BuildStream are we using in the CI,
not as part as the image; an update can break the build and the same commit
that built today can break tomorrow

This reverts commit 3de7f8086cfc89e11ffdf88651ab415e661e2609.
---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfacc42f..44019a3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,14 @@ variables:
 
 .bst_before_script: &bst_before_script
   before_script:
+    # Update to latest BuildStream
+    - |
+      cd ~/buildstream
+      git pull origin master
+      dnf install -y python3-pip
+      pip3 install .
+      cd -
+
     # Create ~/.ssh for storing keys
     - mkdir -p ~/.ssh
 
-- 
cgit v1.2.1


From 94b209c9a799a6a5316587df5d74960386ee0e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 25 Oct 2017 14:57:12 +0100
Subject: .gitlab-ci.yml: Use specific version of BuildStream instead current
 master

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44019a3a..afd25962 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
   XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache"
   YBD_base: "/cache/ybd_base"
   YBD_gits: "${CI_PROJECT_DIR}/.cache/ybd_base/gits"
+  BST_SHA: 'b14a0c575991f3b75aa15b21b2652186b62d0a09'
   GET_SOURCES_ATTEMPTS: 3
 
 # Store all the downloaded git and ostree repos in the distributed cache.
@@ -39,11 +40,10 @@ variables:
 
 .bst_before_script: &bst_before_script
   before_script:
-    # Update to latest BuildStream
+    # Use specific version of BuildStream
     - |
-      cd ~/buildstream
-      git pull origin master
-      dnf install -y python3-pip
+      git clone https://gitlab.com/BuildStream/buildstream.git
+      cd buildstream && git checkout $BST_SHA
       pip3 install .
       cd -
 
-- 
cgit v1.2.1


From 56885a36e5c3830a6c6c7a663730a8a297a5825c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 25 Oct 2017 15:10:08 +0100
Subject: .gitlab-ci.yml: Use specific version of ybd, spec, defs2bst

Current master of all those
---
 .gitlab-ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afd25962..35ac772e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,10 @@ variables:
   XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache"
   YBD_base: "/cache/ybd_base"
   YBD_gits: "${CI_PROJECT_DIR}/.cache/ybd_base/gits"
+  YBD_SHA: '157986cb2f7c0b95e0e4e0bf3a39547f548a298d'
+  SPEC_SHA: '715023f3cf6e714839fb56236ade20de40855bd4'
   BST_SHA: 'b14a0c575991f3b75aa15b21b2652186b62d0a09'
+  DEFS2BST_SHA: '7572160e23b35b11872148c280bd6f9b5da900bb'
   GET_SOURCES_ATTEMPTS: 3
 
 # Store all the downloaded git and ostree repos in the distributed cache.
@@ -32,9 +35,10 @@ variables:
     # Install and configure YBD
     - |
       export LC_ALL="C.UTF-8"
-      export CI_YBD_BRANCH=`[[ "$CI_BUILD_REF_NAME" =~ ^staging/fromybd/ ]] && echo -b ${CI_BUILD_REF_NAME#staging/fromybd/}`
       git clone https://gitlab.com/baserock/spec.git
-      git clone https://gitlab.com/baserock/ybd.git $CI_YBD_BRANCH
+      git -C spec checkout $SPEC_SHA
+      git clone https://gitlab.com/baserock/ybd.git
+      git -C ybd checkout $YBD_SHA
       cd ybd && ./install_dependencies.sh && cd ..
       pip install -r spec/requirements.txt
 
@@ -240,9 +244,11 @@ bst-convert:
   - |
     if [ ! -d ./ybd ]; then
       git clone https://gitlab.com/baserock/ybd.git
+      git -C ybd checkout $YBD_SHA
       cd ybd && ./install_dependencies.sh && cd -
     fi
     git clone https://gitlab.com/BuildStream/defs2bst.git
+    git -C defs2bst checkout $DEFS2BST_SHA
     echo "defs2bst version: $(git -C ./defs2bst rev-parse HEAD)"
   - ./convert
   artifacts:
-- 
cgit v1.2.1