From 8777dcb28e6a30e429178f372ab4a5a857f70ea2 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 13 Oct 2017 11:53:16 +0100 Subject: Separate ybd and bst remote caches --- .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18103d7a..e42cce41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,20 @@ variables: YBD_gits: "${CI_PROJECT_DIR}/cache/ybd_base/gits" GET_SOURCES_ATTEMPTS: 3 -cache: - paths: - # Store all the downloaded git and ostree repos in the distributed cache. - # This saves us fetching them from git.baserock.org and further afield - # on every build. - - cache/ybd_base/gits - - cache/buildstream/sources/ +# Store all the downloaded git and ostree repos in the distributed cache. +# This saves us fetching them from git.baserock.org and further afield +# on every build. +.ybd_cache: &ybd_cache + cache: + # GitLab defined default key is "default". Reuse this for ybd. + key: default + paths: + - cache/ybd_base/gits +.bst_cache: &bst_cache + cache: + key: bst + paths: + - cache/buildstream/sources/ .ybd_before_script: &ybd_before_script before_script: @@ -80,12 +87,14 @@ ybd-validate-all-definitions: <<: *ybd_before_script script: - python spec/quick_check.py . + <<: *ybd_cache ybd-build-system-x86_64-chroot-build: stage: build-1 <<: *ybd_before_script script: - ybd/ybd.py systems/build-system-x86_64-chroot.morph x86_64 + <<: *ybd_cache ybd-build-system-x86_64-chroot-deploy: stage: deploy-1 @@ -94,6 +103,7 @@ ybd-build-system-x86_64-chroot-deploy: <<: *ybd_before_script script: - ybd/ybd.py clusters/build-system-x86_64-chroot-deploy.morph x86_64 + <<: *ybd_cache artifacts: name: "${CI_BUILD_NAME}-${CI_BUILD_REF}" paths: @@ -114,6 +124,7 @@ ybd-devel-build-64: <<: *ybd_before_script script: - ybd/ybd.py systems/devel-system-x86_64-generic.morph x86_64 + <<: *ybd_cache ybd-genivi-baseline-build-64: stage: build-2 @@ -121,6 +132,7 @@ ybd-genivi-baseline-build-64: script: - ybd/ybd.py genivi/systems/genivi-baseline-system-x86_64-generic.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ybd-genivi-demo-platform-build-64: stage: build-3 @@ -128,6 +140,7 @@ ybd-genivi-demo-platform-build-64: script: - ybd/ybd.py genivi/systems/genivi-demo-platform-x86_64-generic.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ybd-ivi-build-64: stage: build-3 @@ -135,6 +148,7 @@ ybd-ivi-build-64: script: - ybd/ybd.py ivi/systems/ivi-system-x86_64.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ybd-gnome-build-64: stage: build-3 @@ -142,12 +156,14 @@ ybd-gnome-build-64: script: - ybd/ybd.py gnome/systems/gnome-system-x86_64.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ybd-minimal-build-64: stage: build-1 <<: *ybd_before_script script: - ybd/ybd.py systems/minimal-system-x86_64-chroot.morph x86_64 + <<: *ybd_cache ybd-minimal-system-x86_64-chroot-deploy: stage: deploy-1 @@ -156,6 +172,7 @@ ybd-minimal-system-x86_64-chroot-deploy: <<: *ybd_before_script script: - ybd/ybd.py clusters/minimal-system-x86_64-chroot-deploy.morph x86_64 + <<: *ybd_cache artifacts: name: "${CI_BUILD_NAME}-${CI_BUILD_REF}" paths: @@ -166,6 +183,7 @@ ybd-trove-build-64: <<: *ybd_before_script script: - ybd/ybd.py trove/systems/trove-system-x86_64.morph x86_64 + <<: *ybd_cache ybd-weston-build-64: stage: build-2 @@ -173,6 +191,7 @@ ybd-weston-build-64: script: - ybd/ybd.py weston/systems/weston-system-x86_64-generic.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ybd-weston-qt-build-64: stage: build-3 @@ -180,6 +199,7 @@ ybd-weston-qt-build-64: script: - ybd/ybd.py weston/systems/weston-qt5-system-x86_64.morph x86_64 - ybd/ybd.py systems/initramfs-x86_64.morph x86_64 + <<: *ybd_cache ########################################## @@ -210,6 +230,7 @@ bst-build-build-system: <<: *bst_before_script script: - scripts/bst-build-or-show systems/build-system-content.bst + <<: *bst_cache # Test building all converted Baserock systems bst-build-base-system: @@ -217,60 +238,70 @@ bst-build-base-system: <<: *bst_before_script script: - scripts/bst-build-or-show systems/base-system-content.bst + <<: *bst_cache bst-build-devel-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/devel-system-content.bst + <<: *bst_cache bst-build-genivi-demo-platform-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/genivi-demo-platform-content.bst + <<: *bst_cache bst-build-gnome-system: stage: build-2 <<: *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 <<: *bst_before_script script: - scripts/bst-build-or-show systems/ivi-system-content.bst + <<: *bst_cache bst-build-minimal-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/minimal-system-content.bst + <<: *bst_cache bst-build-openstack-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/openstack-system-content.bst + <<: *bst_cache bst-build-trove-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/trove-system-content.bst + <<: *bst_cache bst-build-weston-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/weston-system-content.bst + <<: *bst_cache bst-build-weston-qt5-system: stage: build-2 <<: *bst_before_script script: - scripts/bst-build-or-show systems/weston-qt5-system-content.bst + <<: *bst_cache # Test cross building a toolchain and sysroot for each supported non-x86_64 # architecture. @@ -279,21 +310,25 @@ bst-build-sysroot-armv8b64: <<: *bst_before_script script: - scripts/bst-cross-build-or-show armv8b64 gnu-toolchain/stage2.bst + <<: *bst_cache bst-build-sysroot-armv8l64: stage: build-3 <<: *bst_before_script script: - scripts/bst-cross-build-or-show armv8l64 gnu-toolchain/stage2.bst + <<: *bst_cache bst-build-sysroot-ppc64b: stage: build-3 <<: *bst_before_script script: - scripts/bst-cross-build-or-show ppc64b gnu-toolchain/stage2.bst + <<: *bst_cache bst-build-sysroot-ppc64l: stage: build-3 <<: *bst_before_script script: - scripts/bst-cross-build-or-show ppc64l gnu-toolchain/stage2.bst + <<: *bst_cache -- cgit v1.2.1