opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-21 19:55:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump cirrus image with easier dependency management

Browse Source 
- for cni tests remove netavark and aardvark only if installed
- install ginkgo in envs wherever needed

Related:
https://github.com/containers/automation_images/pull/177
https://github.com/containers/automation_images/issues/159
https://github.com/containers/automation_images/issues/161

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

Update .cirrus.yml

Co-authored-by: Chris Evich <1183438+cevich@users.noreply.github.com>
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar
2023-01-26 18:40:14 +05:30
parent 8f0a0f3ec3
commit 0ffce81810
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -33,7 +33,7 @@ env:
UBUNTU_NAME: "ubuntu-2204" UBUNTU_NAME: "ubuntu-2204"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c6447802205601792" IMAGE_SUFFIX: "c5841131699699712"
# EC2 images # EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}" FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"

7
contrib/cirrus/lib.sh
View File

@ -217,10 +217,11 @@ use_cni() {
# Other packages depend on nv/av, but we're testing with podman # Other packages depend on nv/av, but we're testing with podman
# binaries built from source, so it's safe to ignore these deps. # binaries built from source, so it's safe to ignore these deps.
# #
# FIXME FIXME FIXME: if/when we bring back Ubuntu (or use Debian),
# someone will have to conditionalize these rpm/dnf commands
# Do not fail when netavark and aardvark-dns are not installed. # Do not fail when netavark and aardvark-dns are not installed.
rpm -e --nodeps netavark aardvark-dns || true for pkg in aardvark-dns netavark
do
[ -z "$(rpm -qa | grep $pkg)" ] && echo "$pkg not installed" || rpm -e --nodeps $pkg
done
msg "Installing default CNI configuration" msg "Installing default CNI configuration"
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins* dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
cd $GOSRC || exit 1 cd $GOSRC || exit 1

5
contrib/cirrus/runner.sh
View File

@ -92,8 +92,11 @@ function _run_bud() {
} }
function _run_bindings() { function _run_bindings() {
# install ginkgo
make .install.ginkgo
# shellcheck disable=SC2155 # shellcheck disable=SC2155
export PATH=$PATH:$GOSRC/hack export PATH=$PATH:$GOSRC/hack:$GOSRC/test/tools/build
# if logformatter sees this, it can link directly to failing source lines # if logformatter sees this, it can link directly to failing source lines
local gitcommit_magic= local gitcommit_magic=

5
contrib/cirrus/setup_environment.sh
View File

@ -264,7 +264,8 @@ case "$TEST_FLAVOR" in
pip install --requirement $GOSRC/test/apiv2/python/requirements.txt pip install --requirement $GOSRC/test/apiv2/python/requirements.txt
;& # continue with next item ;& # continue with next item
compose) compose)
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker* make install.tools
dnf install -y podman-docker*
;& # continue with next item ;& # continue with next item
int) int)
make .install.ginkgo make .install.ginkgo
@ -303,7 +304,7 @@ case "$TEST_FLAVOR" in
install_test_configs install_test_configs
;; ;;
machine) machine)
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy* dnf install -y podman-gvproxy*
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
install_test_configs install_test_configs