summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brewer <ben.brewer@codethink.co.uk>2018-07-19 13:34:59 (GMT)
committerBen Brewer <ben.brewer@codethink.co.uk>2018-07-25 09:42:46 (GMT)
commit4602d7b8854df30ff7048bedf85c069ae1926a30 (patch)
tree2641db5e0551ff6c64b34843abda2e5a16bf8c1b
parente89894826eeccc319e7de35ee098290bc0c97738 (diff)
downloaddefinitions-4602d7b8854df30ff7048bedf85c069ae1926a30.tar.gz
Fix CI config
-rw-r--r--.gitlab-ci.yml136
1 files changed, 7 insertions, 129 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8778f77..ef6ad2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,10 @@ variables:
echo " fetchers: 1" >> ~/.config/buildstream.conf
echo " on-error: quit" >> ~/.config/buildstream.conf
fi
- cat ~/.config/buildstream.conf
+
+ if [ -f ~/.config/buildstream.conf ]; then
+ cat ~/.config/buildstream.conf
+ fi
# Store all the downloaded git and ostree repos in the distributed cache.
# This saves us fetching them from git.baserock.org and further afield
@@ -73,33 +76,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='8f8992a18d55c3abf28d4b6fc8036bd39d3dc1cf'
- - git clone https://gitlab.com/baserock/definitions.git old-definitions-morph-format
- - git -C old-definitions-morph-format checkout $DEFINITIONS_YBD_SHA
- # 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:
@@ -126,104 +105,3 @@ bst-minimal-system-deploy:
paths:
- ./minimal-system/sda.img
expire_in: 1 week
-
-# 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
- <<: *bst_cache
-
-# Test building the rest of the Baserock systems
-bst-build-base-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/base-system-content.bst
- <<: *bst_cache
-
-bst-build-build-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/build-system-content.bst
- <<: *bst_cache
-
-bst-build-genivi-demo-platform-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/genivi-demo-platform-content.bst
- <<: *bst_cache
-
-bst-build-gnome-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/gnome-system-content.bst
- <<: *bst_cache
-
-bst-build-ivi-demo-platform-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/ivi-system-content.bst
- <<: *bst_cache
-
-bst-build-openstack-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/openstack-system-content.bst
- <<: *bst_cache
-
-bst-build-trove-system:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-build-or-show systems/trove-system-content.bst
- <<: *bst_cache
-
-# Test cross building a toolchain and sysroot for each supported non-x86_64
-# architecture.
-bst-build-sysroot-armv8b64:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-cross-build-or-show armv8b64 gnu-toolchain/stage2.bst
- <<: *bst_cache
-
-bst-build-sysroot-armv8l64:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-cross-build-or-show armv8l64 gnu-toolchain/stage2.bst
- <<: *bst_cache
-
-bst-build-sysroot-ppc64b:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-cross-build-or-show ppc64b gnu-toolchain/stage2.bst
- <<: *bst_cache
-
-bst-build-sysroot-ppc64l:
- stage: build-2
- dependencies: []
- <<: *bst_before_script
- script:
- - scripts/bst-cross-build-or-show ppc64l gnu-toolchain/stage2.bst
- <<: *bst_cache