git: 6eea2623b5c6 - stable/13 - Cirrus-CI: retry pkg installation on failure

[Ed Maste]

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=6eea2623b5c6d6aad9976b591c23c20c8a227c74

commit 6eea2623b5c6d6aad9976b591c23c20c8a227c74
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-06-02 14:42:57 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-06-10 12:54:52 +0000

    Cirrus-CI: retry pkg installation on failure
    
    Pkg installation failed somewhat frequently, always at:
    
    [62/104] Fetching jpeg-turbo-2.0.6.txz: .......... done
    pkg: http://pkgmir.geo.freebsd.org/FreeBSD:13:amd64/quarterly/All/jbigkit-2.1_1.txz: No route to host
    
    Move pkg installation to a script and retry once upon failure as a
    (hopefully temporary) workaround.
    
    Reviewed by:    imp
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D30613
    
    (cherry picked from commit dd41de95a84d979615a2ef11df6850622bf6184e)
---
 .cirrus-ci/pkg-install.sh | 15 +++++++++++++++
 .cirrus.yml               |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.cirrus-ci/pkg-install.sh b/.cirrus-ci/pkg-install.sh
new file mode 100644
index 000000000000..ef83e5284078
--- /dev/null
+++ b/.cirrus-ci/pkg-install.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+pkg install -y "$@" && exit 0
+
+cat <<EOF
+pkg install failed
+
+dmesg tail:
+$(dmesg | tail)
+
+trying again
+EOF
+
+pkg install -y "$@"
diff --git a/.cirrus.yml b/.cirrus.yml
index 65dda70e7012..2c98c1ff45b0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -17,7 +17,7 @@ task:
   name: World and kernel amd64 build and boot smoke test
   timeout_in: 120m
   install_script:
-  - pkg install -y qemu uefi-edk2-qemu-x86_64 llvm11
+  - sh .cirrus-ci/pkg-install.sh qemu uefi-edk2-qemu-x86_64 llvm11
   setup_script:
   - uname -a
   - df -m
@@ -32,4 +32,4 @@ task:
   - sh tools/boot/ci-qemu-test.sh
   post_script:
   - df -m
-  - du -m -s /usr/obj
+  - du -m -s /usr/obj
\ No newline at end of file