From 78a1deb958f7724094c4071ad0a685bc4297b200 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 24 Mar 2020 12:58:30 +0100 Subject: gitlab-ci: Place files from the Mesa repo into the build tarball There's some files from the .gitlab-ci directory that are needed in the test stage and that, because the Mesa repository isn't checked out in that stage, need to be made available through other means. Because those files are going to be needed in LAVA devices, place them ino the tarball containing the built files so it's available to both gitlab-ci runners and LAVA devices. Before those files were passed in the artifacts of the Gitlab CI job, but this commit places them into the built tarball so scripts later in the pipeline don't need to account for this discrepancy. Signed-off-by: Tomeu Vizoso Reviewed-by: Eric Anholt (cherry picked from commit 92f3c51560f9eb2387b1d929f694244c0b7bd577) Part-of: --- .gitlab-ci/prepare-artifacts.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to '.gitlab-ci/prepare-artifacts.sh') diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index b1424b12102..3283eb75eec 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -22,13 +22,13 @@ find install -name \*.so -exec $STRIP {} \; # Test runs don't pull down the git tree, so put the dEQP helper # script and associated bits there. -mkdir -p artifacts/ -cp VERSION artifacts/ -cp -Rp .gitlab-ci/deqp* artifacts/ -cp -Rp .gitlab-ci/piglit artifacts/ +cp VERSION install/ +cp -Rp .gitlab-ci/deqp* install/ +cp -Rp .gitlab-ci/piglit install/ # Tar up the install dir so that symlinks and hardlinks aren't each # packed separately in the zip file. +mkdir -p artifacts/ tar -cf artifacts/install.tar install # If the container has LAVA stuff, prepare the artifacts for LAVA jobs @@ -38,13 +38,8 @@ if [ -d /lava-files ]; then cp /lava-files/*.dtb artifacts/. # Pack ramdisk for LAVA - mkdir -p /lava-files/rootfs-${CROSS:-arm64}/mesa - cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/mesa/. - - cp .gitlab-ci/deqp-runner.sh /lava-files/rootfs-${CROSS:-arm64}/deqp/. - cp .gitlab-ci/deqp-*-fails.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/. - cp .gitlab-ci/deqp-*-skips.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/. - find /lava-files/rootfs-${CROSS:-arm64}/ -type f -printf "%s\t%i\t%p\n" | sort -n | tail -100 + mkdir -p /lava-files/rootfs-${CROSS:-arm64}/install + cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/install/. pushd /lava-files/rootfs-${CROSS:-arm64}/ find -H | cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz -- cgit v1.2.3