# 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 -Rp .gitlab-ci/traces.yml artifacts/
-cp -Rp .gitlab-ci/tracie artifacts/
-cp -Rp .gitlab-ci/tracie-runner.sh artifacts/
+echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSION
+cp -Rp .gitlab-ci/bare-metal install/
+cp -Rp .gitlab-ci/deqp* install/
+cp -Rp .gitlab-ci/piglit install/
+cp -Rp .gitlab-ci/traces-baremetal.yml install/
+cp -Rp .gitlab-ci/traces.yml install/
+cp -Rp .gitlab-ci/tracie install/
+cp -Rp .gitlab-ci/tracie-runner-gl.sh install/
+cp -Rp .gitlab-ci/tracie-runner-vk.sh install/
+cp -Rp .gitlab-ci/fossils.yml install/
+cp -Rp .gitlab-ci/fossils install/
+cp -Rp .gitlab-ci/fossilize-runner.sh install/
+cp -Rp .gitlab-ci/deqp-runner.sh install/
+cp -Rp .gitlab-ci/deqp-*-fails.txt install/
+cp -Rp .gitlab-ci/deqp-*-skips.txt install/
+
+ci-fairy minio login $CI_JOB_JWT
+# These credentials will be used for uploading artifacts from test jobs
+cp .minio_credentials 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
-if [ -d /lava-files ]; then
- # Copy kernel and device trees for LAVA
- cp /lava-files/*Image artifacts/.
- 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
-
- pushd /lava-files/rootfs-${CROSS:-arm64}/
- find -H | cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz
- popd
-
- if [ -z "$CROSS" ]; then
- gzip -c artifacts/Image > Image.gz
- cat Image.gz artifacts/apq8016-sbc.dtb > Image.gz-dtb
- abootimg \
- --create artifacts/db410c.img \
- -k Image.gz-dtb \
- -r artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz \
- -c cmdline="ip=dhcp console=ttyMSM0,115200n8"
- rm Image.gz Image.gz-dtb
- fi
-
- # Store job ID so the test stage can build URLs to the artifacts
- echo $CI_JOB_ID > artifacts/build_job_id.txt
-
+if [ -n "$UPLOAD_FOR_LAVA" ]; then
# Pass needed files to the test stage
cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
+ cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/.
+
+ gzip -c artifacts/install.tar > mesa-${DEBIAN_ARCH}.tar.gz
+ MINIO_PATH=minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+ ci-fairy minio cp mesa-${DEBIAN_ARCH}.tar.gz minio://${MINIO_PATH}/mesa-${DEBIAN_ARCH}.tar.gz
fi