From e40b99e1319f2a3762a7b7d11869e26c5296f7f7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 15 Dec 2020 15:17:42 +0000
Subject: [PATCH] ci: make bootstrap just another kas overlay

Simplify the gitlab-ci by having the bootstrap build as just another Kas
overlay file, so there's no duplication of build script.

Change-Id: I7341750d2ae7f3c146bfe323f61fa98c0f3121c0
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml    | 6 +-----
 kas/bootstrap.yml | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 kas/bootstrap.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f43dc8f9..aa7c6a31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,13 +36,9 @@ stages:
 
 # Build a number of native tools first to ensure the other builders don't race
 # over them
-bootstrap:
+n1sdp/bootstrap:
   extends: .build
   stage: bootstrap
-  variables:
-    KAS_TARGET: binutils-cross-aarch64 gcc-cross-aarch64 python3-native opkg-native rpm-native
-  script:
-  - kas build kas/n1sdp.yml
 
 # What percentage of machines in the layer do we build
 machine-coverage:
diff --git a/kas/bootstrap.yml b/kas/bootstrap.yml
new file mode 100644
index 00000000..0e05e46b
--- /dev/null
+++ b/kas/bootstrap.yml
@@ -0,0 +1,9 @@
+header:
+  version: 9
+
+target:
+  - binutils-cross-aarch64
+  - gcc-cross-aarch64
+  - python3-native
+  - opkg-native
+  - rpm-native