From a24cc463a021c0958bc28a1d96975612d65b79a9 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 23 Jun 2022 16:58:45 -0400 Subject: [PATCH 1/2] Remove bats installation script and make target While convenient, it can be problematic to rely on a Makefile to install software. This was found to be the case across multiple environments WRT `bats`. Fix this by removing the install script and target. A future commit will ensure the correct version of `bats` is present in all CI environments where it's required. Signed-off-by: Chris Evich --- Makefile | 6 +----- hack/install_bats.sh | 22 ---------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100755 hack/install_bats.sh diff --git a/Makefile b/Makefile index d172f2048d..6141b43896 100644 --- a/Makefile +++ b/Makefile @@ -825,7 +825,7 @@ install.systemd: endif .PHONY: install.tools -install.tools: .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools +install.tools: .install.ginkgo .install.golangci-lint ## Install needed tools make -C test/tools .PHONY: .install.ginkgo @@ -842,10 +842,6 @@ install.tools: .install.ginkgo .install.golangci-lint .install.bats ## Install n make -C test/tools build/go-md2man ; \ fi -.PHONY: .install.bats -.install.bats: - VERSION=v1.1.0 ./hack/install_bats.sh - .PHONY: .install.pre-commit .install.pre-commit: if [ -z "$(PRE_COMMIT)" ]; then \ diff --git a/hack/install_bats.sh b/hack/install_bats.sh deleted file mode 100755 index 01de8b7c6d..0000000000 --- a/hack/install_bats.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -e - -die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; } - -if [[ "$(type -t bats)" != "" ]]; then - # bats is already installed. - exit 0 -fi - -buildDir=$(mktemp -d) -git clone https://github.com/bats-core/bats-core $buildDir - -pushd $buildDir -pwd -git reset --hard ${VERSION} -echo "Installing bats to /usr/local (requires root)" -sudo ./install.sh /usr/local -popd - -rm -rf $buildDir From a53a0fca96f8d90d6a1078066618627aa9829267 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 23 Jun 2022 17:03:30 -0400 Subject: [PATCH 2/2] Cirrus: Minor YAML cleanup A prior change added extra whitespace when commenting out several sections to temporarily disable F35 testing. This restores the sections to proper indentation, so (in the future) only the `#` character needs to be removed. Signed-off-by: Chris Evich --- .cirrus.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index bf3f1aa7b4..9daf33ba26 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -171,11 +171,11 @@ build_task: CTR_FQIN: ${FEDORA_CONTAINER_FQIN} # ID for re-use of build output CI_DESIRED_RUNTIME: crun - #- env: &priorfedora_envvars - #DISTRO_NV: ${PRIOR_FEDORA_NAME} - #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} - #CI_DESIRED_RUNTIME: crun + #- env: &priorfedora_envvars + #DISTRO_NV: ${PRIOR_FEDORA_NAME} + #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + #CI_DESIRED_RUNTIME: crun - env: &ubuntu_envvars DISTRO_NV: ${UBUNTU_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} @@ -639,11 +639,11 @@ container_integration_test_task: VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CI_DESIRED_RUNTIME: crun - #- env: - #DISTRO_NV: ${PRIOR_FEDORA_NAME} - #_BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} - #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + #- env: + #DISTRO_NV: ${PRIOR_FEDORA_NAME} + #_BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} + #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} gce_instance: *standardvm timeout_in: 90m env: