diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-10-26 16:49:50 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-10-26 16:51:34 +0000 |
commit | cf331d6e5ba8ab2e50e9295db13482c167afd2a2 (patch) | |
tree | 5ac68b023dda4567d6153718ef2afeb919761838 | |
parent | 995a5b3effc82c39f929d0290e74b84ee25d773b (diff) | |
parent | 56885a36e5c3830a6c6c7a663730a8a297a5825c (diff) | |
download | definitions-cf331d6e5ba8ab2e50e9295db13482c167afd2a2.tar.gz |
Merge remote-tracking branch 'origin/master' into sam/bootstrap-from-baserock-binaries
-rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfacc42f..35ac772e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +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. @@ -31,14 +35,22 @@ 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 .bst_before_script: &bst_before_script before_script: + # Use specific version of BuildStream + - | + git clone https://gitlab.com/BuildStream/buildstream.git + cd buildstream && git checkout $BST_SHA + pip3 install . + cd - + # Create ~/.ssh for storing keys - mkdir -p ~/.ssh @@ -232,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: |