Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cirrus: Use pre-installed bats #14719

Merged
merged 2 commits into from
Jul 28, 2022
Merged

Cirrus: Use pre-installed bats #14719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24cc46
Remove bats installation script and make target
cevich Jun 23, 2022
a53a0fc
Cirrus: Minor YAML cleanup
cevich Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
cevich marked this conversation as resolved.
Show resolved Hide resolved
- env: &ubuntu_envvars
DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
22 changes: 0 additions & 22 deletions hack/install_bats.sh
View file
Open in desktop

This file was deleted.