From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 19 Nov 2018 15:03:58 +0000 (+0000)
Subject: automation: also specify xen binary as artifact on x86_64
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3c21dba1891d80b89bb4680d12febc17f8254305;p=people%2Froyger%2Fxen.git

automation: also specify xen binary as artifact on x86_64

... so that it can be passed on to test stage.

Note that xen is only extracted for x86_64 build since others may not
have that. Use a directory to account for possibly different file
names on Arm.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Doug Goldstein <cardoe@cardoe.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f3504f15d..a1672a9a91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ stages:
     - ./automation/scripts/build 2>&1 | tee build.log
   artifacts:
     paths:
+      - binaries/
       - xen-config
       - '*.log'
     when: always
diff --git a/automation/scripts/build b/automation/scripts/build
index a1f9a5da56..e3672a3626 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -28,6 +28,10 @@ make -j$(nproc) dist
 
 # Extract artifacts to avoid getting rewritten by customised builds
 cp xen/.config xen-config
+mkdir binaries
+if [[ "${XEN_TARGET_ARCH}" == "x86_64" ]]; then
+    cp xen/xen binaries/xen
+fi
 
 # Build all the configs we care about
 case ${XEN_TARGET_ARCH} in