OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/bare-metal: Fix capturing of serial output as job artifacts.

Browse Source 
I tried to put them in the wrong directory -- everything needs to go in
results/, which we want clean and ready before we start our job.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6529>
This commit is contained in:
Eric Anholt
2020-08-31 13:04:28 -07:00
parent 24f5f11719
commit 0453a46f66
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/bare-metal/cros-servo.sh
View File

@@ -50,7 +50,6 @@ set -ex
# Clear out any previous run's artifacts. # Clear out any previous run's artifacts.
rm -rf results/ rm -rf results/
mkdir -p 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 # 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. # state, since it's volume-mounted on the host.
@@ -72,9 +71,7 @@ ret=$?
set -e set -e
# Bring artifacts back from the NFS dir to the build dir where gitlab-runner # 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 # will look for them.
# with cp.
mkdir -p results
cp -Rp /nfs/results/. results/ cp -Rp /nfs/results/. results/
exit $ret exit $ret

4
.gitlab-ci/bare-metal/cros_servo_run.py
View File

@@ -35,8 +35,8 @@ class CrosServoRun:
self.sentinel = object() self.sentinel = object()
self.threads_done = 0 self.threads_done = 0
self.ec_ser = SerialBuffer(ec, "artifacts/serial-ec.txt", "R SERIAL-EC> ") self.ec_ser = SerialBuffer(ec, "results/serial-ec.txt", "R SERIAL-EC> ")
self.cpu_ser = SerialBuffer(cpu, "artifacts/serial.txt", "R SERIAL-CPU> ") self.cpu_ser = SerialBuffer(cpu, "results/serial.txt", "R SERIAL-CPU> ")
self.iter_feed_ec = threading.Thread(target=self.iter_feed_queue, daemon=True, args=(self.ec_ser.lines(),)) self.iter_feed_ec = threading.Thread(target=self.iter_feed_queue, daemon=True, args=(self.ec_ser.lines(),))
self.iter_feed_ec.start() self.iter_feed_ec.start()