From ddc6685a1f90f3cc496449412d20416abd71f94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 27 Nov 2017 00:10:28 +0000
Subject: .gitlab-ci.yml: Only build one converted system, use the current bst
 definition for the rest

---
 .gitlab-ci.yml | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 842e8edc..4ffac991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,8 +101,7 @@ bst-convert:
 # Test building the simplest Baserock system first
 bst-build-minimal-system:
   stage: build-1
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/minimal-system-content.bst
@@ -111,7 +110,6 @@ bst-build-minimal-system:
 bst-minimal-system-deploy:
   stage: deploy-1
   dependencies:
-  - bst-convert
   - bst-build-minimal-system
   <<: *bst_before_script
   script:
@@ -126,20 +124,28 @@ bst-minimal-system-deploy:
     - ./minimal-system/sda.img
     expire_in: 1 week
 
-# Test building all converted Baserock systems
-bst-build-base-system:
+# 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-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/build-system-content.bst
@@ -147,8 +153,7 @@ bst-build-build-system:
 
 bst-build-genivi-demo-platform-system:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/genivi-demo-platform-content.bst
@@ -156,8 +161,7 @@ bst-build-genivi-demo-platform-system:
 
 bst-build-gnome-system:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/gnome-system-content.bst
@@ -165,8 +169,7 @@ bst-build-gnome-system:
 
 bst-build-ivi-demo-platform-system:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/ivi-system-content.bst
@@ -174,8 +177,7 @@ bst-build-ivi-demo-platform-system:
 
 bst-build-openstack-system:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/openstack-system-content.bst
@@ -183,8 +185,7 @@ bst-build-openstack-system:
 
 bst-build-trove-system:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-build-or-show systems/trove-system-content.bst
@@ -194,8 +195,7 @@ bst-build-trove-system:
 # architecture.
 bst-build-sysroot-armv8b64:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-cross-build-or-show armv8b64 gnu-toolchain/stage2.bst
@@ -203,8 +203,7 @@ bst-build-sysroot-armv8b64:
 
 bst-build-sysroot-armv8l64:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-cross-build-or-show armv8l64 gnu-toolchain/stage2.bst
@@ -212,8 +211,7 @@ bst-build-sysroot-armv8l64:
 
 bst-build-sysroot-ppc64b:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-cross-build-or-show ppc64b gnu-toolchain/stage2.bst
@@ -221,8 +219,7 @@ bst-build-sysroot-ppc64b:
 
 bst-build-sysroot-ppc64l:
   stage: build-2
-  dependencies:
-    - bst-convert
+  dependencies: []
   <<: *bst_before_script
   script:
   - scripts/bst-cross-build-or-show ppc64l gnu-toolchain/stage2.bst
-- 
cgit v1.2.1