From d23fd9101bc7971cda7b1be80ed82c53da8ccac2 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 6 Jul 2020 11:15:03 -0600 Subject: [PATCH] [CI:IMG] Bump crun to 1.14 on CI VMs This began as an empty commit intended solely to get CI to rebuild the VMs using crun 1.14 (up from 1.13). Twin goals: 1) Be able to test #6693 (--sdnotify option); and 2) Get rid of 'cgroup.freeze' CI flakes. These are fixed by crun PRs 419 and 423 respectively. CI failed on the original PR submission, with errors on ginkgo install. The change to Makefile is intended to address that. The change to setup_environment.sh is intended to address a flake we're frequently seeing with the Fedora dnf repos. This adds a retry in case of a failing dnf command. Signed-off-by: Ed Santiago --- Makefile | 2 +- contrib/cirrus/setup_environment.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5c813dac5c..2b699faa3c 100644 --- a/Makefile +++ b/Makefile @@ -629,7 +629,7 @@ endef .PHONY: .install.ginkgo .install.ginkgo: .gopathok if [ ! -x "$(GOBIN)/ginkgo" ]; then \ - $(GO_BUILD) -o ${GOPATH}/bin/ginkgo ./vendor/github.com/onsi/ginkgo/ginkgo ; \ + $(call go-get,github.com/onsi/ginkgo); \ fi .PHONY: .install.gitvalidation diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ea2c7d8e0a..f2bd1fd1ac 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -59,7 +59,7 @@ case "${OS_RELEASE_ID}" in workaround_bfq_bug # HACK: Need Conmon 2.0.17, currently in updates-testing on F31. - dnf update -y --enablerepo=updates-testing conmon + $BIGTO dnf update -y --enablerepo=updates-testing conmon if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then bash "$SCRIPT_BASE/add_second_partition.sh"