opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14719 from cevich/use_preinstalled_bats

Browse Source 
Cirrus: Use pre-installed bats
This commit is contained in:
OpenShift Merge Robot
2022-07-28 21:05:23 +02:00
committed by GitHub
parent 5eb06e7592 a53a0fca96
commit 509ad4280f
3 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.cirrus.yml
View File

@ -171,11 +171,11 @@ build_task:
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# ID for re-use of build output # ID for re-use of build output
CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
#- env: &priorfedora_envvars #- env: &priorfedora_envvars
#DISTRO_NV: ${PRIOR_FEDORA_NAME} #DISTRO_NV: ${PRIOR_FEDORA_NAME}
#VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
#CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
#CI_DESIRED_RUNTIME: crun #CI_DESIRED_RUNTIME: crun
- env: &ubuntu_envvars - env: &ubuntu_envvars
DISTRO_NV: ${UBUNTU_NAME} DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
@ -639,11 +639,11 @@ container_integration_test_task:
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
#- env: #- env:
#DISTRO_NV: ${PRIOR_FEDORA_NAME} #DISTRO_NV: ${PRIOR_FEDORA_NAME}
#_BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} #_BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
#VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} #VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
#CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} #CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
gce_instance: *standardvm gce_instance: *standardvm
timeout_in: 90m timeout_in: 90m
env: env:

6
Makefile
View File

@ -829,7 +829,7 @@ install.systemd:
endif endif
.PHONY: install.tools .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 make -C test/tools
.PHONY: .install.ginkgo .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 ; \ make -C test/tools build/go-md2man ; \
fi fi
.PHONY: .install.bats
.install.bats:
VERSION=v1.1.0 ./hack/install_bats.sh
.PHONY: .install.pre-commit .PHONY: .install.pre-commit
.install.pre-commit: .install.pre-commit:
if [ -z "$(PRE_COMMIT)" ]; then \ if [ -z "$(PRE_COMMIT)" ]; then \

22
hack/install_bats.sh
View File

@ -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