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

Merge pull request #21366 from edsantiago/new-vms

Browse Source 
Test new CI VMs
This commit is contained in:
openshift-merge-bot[bot]
2024-02-01 19:01:32 +00:00
committed by GitHub
parent 4fde98f380 1ab55defbb
commit c3a32b170d
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -33,7 +33,7 @@ env:
DEBIAN_NAME: "debian-13" DEBIAN_NAME: "debian-13"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c20240102t212217z-f39f38d13" IMAGE_SUFFIX: "c20240201t143038z-f39f38d13"
# EC2 images # EC2 images

2
contrib/cirrus/lib.sh
View File

@ -294,8 +294,6 @@ remove_packaged_podman_files() {
# Do so without running podman, lest that invocation initialize unwanted state. # Do so without running podman, lest that invocation initialize unwanted state.
rm -f /run/podman/podman.sock /run/user/$(id -u)/podman/podman.sock || true rm -f /run/podman/podman.sock /run/user/$(id -u)/podman/podman.sock || true
rm -f $(podman info --format "{{.Host.RemoteSocket.Path}}")
# yum/dnf/dpkg may list system directories, only remove files # yum/dnf/dpkg may list system directories, only remove files
$LISTING_CMD | while read fullpath $LISTING_CMD | while read fullpath
do do

9
contrib/cirrus/setup_environment.sh
View File

@ -205,6 +205,11 @@ runroot = "/run/containers/storage"
graphroot = "/var/lib/containers/storage" graphroot = "/var/lib/containers/storage"
EOF EOF
# Since we've potentially changed important config settings, reset.
# This prevents `database graph driver "" does not match "overlay"`
# on Debian.
rm -rf /var/lib/containers/storage
# shellcheck disable=SC2154 # shellcheck disable=SC2154
showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests" showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests"
echo "STORAGE_FS=$CI_DESIRED_STORAGE" >>/etc/ci_environment echo "STORAGE_FS=$CI_DESIRED_STORAGE" >>/etc/ci_environment
@ -291,6 +296,10 @@ esac
# #
# Either way, this block of code should be removed after March 31 2023 # Either way, this block of code should be removed after March 31 2023
# because it creates a system that is not representative of real-world Fedora. # because it creates a system that is not representative of real-world Fedora.
#
# 2024-01-25 update: ha ha. This fix has proven so popular that it is
# being used by other groups who were seeing the cdn03 flake. Looks like
# we're stuck with it.
if ((CONTAINER==0)); then if ((CONTAINER==0)); then
nsswitch=/etc/authselect/nsswitch.conf nsswitch=/etc/authselect/nsswitch.conf
if [[ -e $nsswitch ]]; then if [[ -e $nsswitch ]]; then

3
test/e2e/run_networking_test.go
View File

@ -24,6 +24,7 @@ var _ = Describe("Podman run networking", func() {
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
It("podman verify network scoped DNS server and also verify updating network dns server", func() { It("podman verify network scoped DNS server and also verify updating network dns server", func() {
Skip("FIXME: needs netavark > 1.10.2, available >= 2024-02-02")
// Following test is only functional with netavark and aardvark // Following test is only functional with netavark and aardvark
SkipIfCNI(podmanTest) SkipIfCNI(podmanTest)
net := createNetworkName("IntTest") net := createNetworkName("IntTest")
@ -71,6 +72,8 @@ var _ = Describe("Podman run networking", func() {
}) })
It("podman network dns multiple servers", func() { It("podman network dns multiple servers", func() {
Skip("FIXME: needs netavark > 1.10.2, available >= 2024-02-02")
// Following test is only functional with netavark and aardvark // Following test is only functional with netavark and aardvark
SkipIfCNI(podmanTest) SkipIfCNI(podmanTest)
net := createNetworkName("IntTest") net := createNetworkName("IntTest")