diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 221fd7ee34e..cca571f8878 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -71,6 +71,8 @@ fi set -ex +date +'%F %T' + # Clear out any previous run's artifacts. rm -rf results/ mkdir -p results @@ -79,6 +81,8 @@ mkdir -p results # state, since it's volume-mounted on the host. rsync -a --delete $BM_ROOTFS/ /nfs/ +date +'%F %T' + # If BM_BOOTFS is an URL, download it if echo $BM_BOOTFS | grep -q http; then apt install -y wget @@ -86,6 +90,8 @@ if echo $BM_BOOTFS | grep -q http; then BM_BOOTFS=/tmp/bootfs.tar fi +date +'%F %T' + # If BM_BOOTFS is a file, assume it is a tarball and uncompress it if [ -f $BM_BOOTFS ]; then mkdir -p /tmp/bootfs @@ -93,14 +99,20 @@ if [ -f $BM_BOOTFS ]; then BM_BOOTFS=/tmp/bootfs fi +date +'%F %T' + # Install kernel modules (it could be either in /lib/modules or # /usr/lib/modules, but we want to install in the latter) [ -d $BM_BOOTFS/usr/lib/modules ] && rsync -a $BM_BOOTFS/usr/lib/modules/ /nfs/usr/lib/modules/ [ -d $BM_BOOTFS/lib/modules ] && rsync -a $BM_BOOTFS/lib/modules/ /nfs/lib/modules/ +date +'%F %T' + # Install kernel image + bootloader files rsync -aL --delete $BM_BOOTFS/boot/ /tftp/ +date +'%F %T' + # Set up the pxelinux config for Jetson Nano mkdir -p /tftp/pxelinux.cfg cat </tftp/pxelinux.cfg/default-arm-tegra210-p3450-0000 @@ -132,6 +144,8 @@ EOF mkdir -p /nfs/results . $BM/rootfs-setup.sh /nfs +date +'%F %T' + echo "$BM_CMDLINE" > /tftp/cmdline.txt # Add some required options in config.txt @@ -155,8 +169,12 @@ while [ $((ATTEMPTS--)) -gt 0 ]; do done set -e +date +'%F %T' + # Bring artifacts back from the NFS dir to the build dir where gitlab-runner # will look for them. cp -Rp /nfs/results/. results/ +date +'%F %T' + exit $ret diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index 7a706d0a024..e6272b72e1e 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -8,10 +8,14 @@ mkdir -p $rootfs_dst/results cp $BM/bm-init.sh $rootfs_dst/init cp $CI_COMMON/init*.sh $rootfs_dst/ +date +'%F %T' + # Make JWT token available as file in the bare-metal storage to enable access # to MinIO cp "${CI_JOB_JWT_FILE}" "${rootfs_dst}${CI_JOB_JWT_FILE}" +date +'%F %T' + cp $CI_COMMON/capture-devcoredump.sh $rootfs_dst/ cp $CI_COMMON/intel-gpu-freq.sh $rootfs_dst/ @@ -28,3 +32,5 @@ set -x # Add the Mesa drivers we built, and make a consistent symlink to them. mkdir -p $rootfs_dst/$CI_PROJECT_DIR rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/ + +date +'%F %T'