Skip to content

Commit

Permalink
[CI:IMG] Bump crun to 1.14 on CI VMs
Browse files Browse the repository at this point in the history
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 containers#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 <[email protected]>
  • Loading branch information
edsantiago committed Jul 8, 2020
1 parent 85d71ae commit d23fd91
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit d23fd91

Please sign in to comment.