summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2019-05-07 17:02:40 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2019-05-07 17:02:40 (GMT)
commit029d08f1098e25cdfd7be0d4cf6ad254e06cee42 (patch)
treeb94b0f975beec6397b790be6f03b9b6bbc1bfac1
parentae0a501eec009ed4002996985f0152f8f0951fd4 (diff)
downloaddefinitions-pedro/fix-conversion-try-master.tar.gz
Stop converting definitons, move forwardpedro/fix-conversion-try-master
-rw-r--r--.gitlab-ci.yml33
1 files changed, 3 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 222907d..9ca799d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,34 +74,9 @@ stages:
- deploy-1
- build-2
-##########################################
-# BuildStream conversions and tests #
-##########################################
-
-# Convert the Baserock definitions to BuildStream format
-bst-convert:
- stage: preprocess
- <<: *bst_before_script
- script:
- # Clone last version of definitions with YBD systems
- - export DEFINITIONS_YBD_SHA='pedro/fix-conversion-try'
- - git clone https://gitlab.com/baserock/definitions.git old-definitions-morph-format
- - git -C old-definitions-morph-format checkout $DEFINITIONS_YBD_SHA
- - cd old-definitions-morph-format
- # Install YBD and defs2bst
- - |
- 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:
- paths:
- - elements/
+######################
+# BuildStream tests #
+######################
# Test building the simplest Baserock system first
bst-build-minimal-system:
@@ -132,8 +107,6 @@ bst-minimal-system-deploy:
# Test building a converted Baserock system
bst-build-build-system-converted:
stage: build-2
- dependencies:
- - bst-convert
<<: *bst_before_script
script:
- scripts/bst-build-or-show systems/build-system-content.bst