projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ci/bare-metal: Fix capturing of serial output as job artifacts.
[mesa.git]
/
.gitlab-ci
/
bare-metal
/
cros-servo.sh
diff --git
a/.gitlab-ci/bare-metal/cros-servo.sh
b/.gitlab-ci/bare-metal/cros-servo.sh
index 6de59d97a683c7fe6d3f0b6d27bca97fa50c13dd..b05eaec50ec31dc512105dccacca42a8b8dd05aa 100755
(executable)
--- a/
.gitlab-ci/bare-metal/cros-servo.sh
+++ b/
.gitlab-ci/bare-metal/cros-servo.sh
@@
-50,7
+50,6
@@
set -ex
# Clear out any previous run's artifacts.
rm -rf results/
mkdir -p results
# Clear out any previous run's artifacts.
rm -rf results/
mkdir -p results
-find artifacts/ -name serial\*.txt | xargs rm -f
# Create the rootfs in the NFS directory. rm to make sure it's in a pristine
# state, since it's volume-mounted on the host.
# Create the rootfs in the NFS directory. rm to make sure it's in a pristine
# state, since it's volume-mounted on the host.
@@
-72,9
+71,7
@@
ret=$?
set -e
# Bring artifacts back from the NFS dir to the build dir where gitlab-runner
set -e
# Bring artifacts back from the NFS dir to the build dir where gitlab-runner
-# will look for them. Note that results/ may already exist, so be careful
-# with cp.
-mkdir -p results
+# will look for them.
cp -Rp /nfs/results/. results/
exit $ret
cp -Rp /nfs/results/. results/
exit $ret