diff options
| -rw-r--r-- | .cirrus.yml | 20 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | hack/install_bats.sh | 22 |
3 files changed, 11 insertions, 37 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index bf3f1aa7b..9daf33ba2 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: @@ -829,7 +829,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 @@ -846,10 +846,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 01de8b7c6..000000000 --- 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 |