diff options
Diffstat (limited to '.gitlab-ci/prepare-artifacts.sh')
| -rwxr-xr-x | .gitlab-ci/prepare-artifacts.sh | 17 |
1 files changed, 6 insertions, 11 deletions
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 |