mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
Cirrus: Add support for Fedora 32
Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
parent
e282c88d2c
commit
d2d9722454
10
.cirrus.yml
10
.cirrus.yml
|
@ -34,12 +34,12 @@ env:
|
|||
####
|
||||
#### Cache-image names to test with (double-quotes around names are critical)
|
||||
###
|
||||
FEDORA_NAME: "fedora-31"
|
||||
PRIOR_FEDORA_NAME: "fedora-30"
|
||||
FEDORA_NAME: "fedora-32"
|
||||
PRIOR_FEDORA_NAME: "fedora-31"
|
||||
UBUNTU_NAME: "ubuntu-19"
|
||||
PRIOR_UBUNTU_NAME: "ubuntu-18"
|
||||
|
||||
_BUILT_IMAGE_SUFFIX: "libpod-6465271544152064"
|
||||
_BUILT_IMAGE_SUFFIX: "libpod-6301182083727360"
|
||||
FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
|
||||
UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
|
||||
|
@ -405,7 +405,7 @@ testing_task:
|
|||
# - name: "test ${PRIOR_FEDORA_NAME}"
|
||||
# gce_instance:
|
||||
# image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
|
||||
# - name: "test ${UBUNTU_CACHE_IMAGE_NAME}"
|
||||
# - name: "test ${UBUNTU_NAME}"
|
||||
# gce_instance:
|
||||
# image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
|
||||
# - name: "test ${PRIOR_UBUNTU_NAME}"
|
||||
|
@ -557,7 +557,7 @@ special_testing_in_podman_task:
|
|||
- name: "in-podman ${PRIOR_FEDORA_NAME}"
|
||||
gce_instance:
|
||||
image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
|
||||
- name: "in-podman ${FEDORA_CACHE_IMAGE_NAME}"
|
||||
- name: "in-podman ${FEDORA_NAME}"
|
||||
gce_instance:
|
||||
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ PACKER_BASE=${PACKER_BASE:-./contrib/cirrus/packer}
|
|||
# Important filepaths
|
||||
SETUP_MARKER_FILEPATH="${SETUP_MARKER_FILEPATH:-/var/tmp/.setup_environment_sh_complete}"
|
||||
AUTHOR_NICKS_FILEPATH="${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/git_authors_to_irc_nicks.csv"
|
||||
BUILDAH_PACKAGES_FILEPATH="./contrib/cirrus/packages.sh" # in buildah repo.
|
||||
|
||||
# Log remote-client system test varlink output here
|
||||
export VARLINK_LOG=/var/tmp/varlink.log
|
||||
|
@ -60,13 +59,13 @@ PACKER_VER="1.4.2"
|
|||
# CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
|
||||
|
||||
# Base-images rarely change, define them here so they're out of the way.
|
||||
export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,ubuntu-19,fedora-31,fedora-30}"
|
||||
export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,ubuntu-19,fedora-32,fedora-31}"
|
||||
# Manually produced base-image names (see $SCRIPT_BASE/README.md)
|
||||
export UBUNTU_BASE_IMAGE="ubuntu-1910-eoan-v20200211"
|
||||
export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20200218"
|
||||
# Manually produced base-image names (see $SCRIPT_BASE/README.md)
|
||||
export FEDORA_BASE_IMAGE="fedora-cloud-base-31-1-9-1578586410"
|
||||
export PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-30-1-2-1578586410"
|
||||
export FEDORA_BASE_IMAGE="fedora-cloud-base-32-n-0-1586202964"
|
||||
export PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-31-1-9-1586202964"
|
||||
export BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUILD_ID}}"
|
||||
# IN_PODMAN container image
|
||||
IN_PODMAN_IMAGE="quay.io/libpod/in_podman:$DEST_BRANCH"
|
||||
|
@ -389,8 +388,7 @@ install_test_configs() {
|
|||
install -v -D -m 644 ./test/registries.conf /etc/containers/
|
||||
}
|
||||
|
||||
# Remove all files (except conmon, for now) provided by the distro version of podman.
|
||||
# Except conmon, for now as it's expected to eventually be packaged separately.
|
||||
# Remove all files provided by the distro version of podman.
|
||||
# All VM cache-images used for testing include the distro podman because (1) it's
|
||||
# required for podman-in-podman testing and (2) it somewhat simplifies the task
|
||||
# of pulling in necessary prerequisites packages as the set can change over time.
|
||||
|
@ -449,26 +447,6 @@ systemd_banish() {
|
|||
$GOSRC/$PACKER_BASE/systemd_banish.sh
|
||||
}
|
||||
|
||||
install_buildah_packages() {
|
||||
git clone https://github.com/containers/buildah.git /tmp/buildah
|
||||
if [[ -r "$BUILDAH_PACKAGES_FILEPATH" ]]; then
|
||||
source "$BUILDAH_PACKAGES_FILEPATH"
|
||||
req_env_var UBUNTU_BUILDAH_PACKAGES FEDORA_BUILDAH_PACKAGES OS_RELEASE_ID
|
||||
case "$OS_RELEASE_ID" in
|
||||
fedora)
|
||||
$BIGTO ooe.sh sudo dnf install -y ${FEDORA_BUILDAH_PACKAGES[@]}
|
||||
;;
|
||||
ubuntu)
|
||||
$LILTO $SUDOAPTGET update
|
||||
$BIGTO $SUDOAPTGET install ${UBUNTU_BUILDAH_PACKAGES[@]}
|
||||
;;
|
||||
*) bad_os_id_ver ;;
|
||||
esac
|
||||
else
|
||||
warn "Could not find $BUILDAH_PACKAGES_FILEPATH in buildah repository root."
|
||||
fi
|
||||
}
|
||||
|
||||
_finalize() {
|
||||
set +e # Don't fail at the very end
|
||||
if [[ -d "$CUSTOM_CLOUD_CONFIG_DEFAULTS" ]]
|
||||
|
|
|
@ -12,6 +12,13 @@ req_env_var SCRIPT_BASE PACKER_BUILDER_NAME GOSRC FEDORA_BASE_IMAGE OS_RELEASE_I
|
|||
|
||||
install_ooe
|
||||
|
||||
if [[ $OS_RELEASE_VER -le 31 ]]; then
|
||||
warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
|
||||
warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
|
||||
echo "mq-deadline" | sudo tee /sys/block/sda/queue/scheduler > /dev/null
|
||||
sudo cat /sys/block/sda/queue/scheduler
|
||||
fi
|
||||
|
||||
export GOPATH="$(mktemp -d)"
|
||||
trap "sudo rm -rf $GOPATH" EXIT
|
||||
|
||||
|
@ -34,6 +41,7 @@ INSTALL_PACKAGES=(\
|
|||
bats
|
||||
bridge-utils
|
||||
btrfs-progs-devel
|
||||
buildah
|
||||
bzip2
|
||||
conmon
|
||||
container-selinux
|
||||
|
@ -81,13 +89,11 @@ INSTALL_PACKAGES=(\
|
|||
protobuf-c
|
||||
protobuf-c-devel
|
||||
protobuf-devel
|
||||
protobuf-python
|
||||
python
|
||||
python3-dateutil
|
||||
python3-psutil
|
||||
python3-pytoml
|
||||
rsync
|
||||
runc
|
||||
selinux-policy-devel
|
||||
skopeo
|
||||
skopeo-containers
|
||||
|
@ -99,6 +105,7 @@ INSTALL_PACKAGES=(\
|
|||
xz
|
||||
zip
|
||||
)
|
||||
|
||||
case "$OS_RELEASE_VER" in
|
||||
30)
|
||||
INSTALL_PACKAGES+=(\
|
||||
|
@ -113,6 +120,10 @@ case "$OS_RELEASE_VER" in
|
|||
INSTALL_PACKAGES+=(crun)
|
||||
REMOVE_PACKAGES+=(runc)
|
||||
;;
|
||||
32)
|
||||
INSTALL_PACKAGES+=(crun)
|
||||
REMOVE_PACKAGES+=(runc)
|
||||
;;
|
||||
*)
|
||||
bad_os_id_ver ;;
|
||||
esac
|
||||
|
@ -120,8 +131,6 @@ esac
|
|||
echo "Installing general build/test dependencies for Fedora '$OS_RELEASE_VER'"
|
||||
$BIGTO ooe.sh sudo dnf install -y ${INSTALL_PACKAGES[@]}
|
||||
|
||||
install_buildah_packages
|
||||
|
||||
[[ "${#REMOVE_PACKAGES[@]}" -eq "0" ]] || \
|
||||
$LILTO ooe.sh sudo dnf erase -y ${REMOVE_PACKAGES[@]}
|
||||
|
||||
|
|
|
@ -17,14 +17,14 @@ variables:
|
|||
PRIOR_UBUNTU_BASE_IMAGE:
|
||||
|
||||
# Latest Fedora release
|
||||
FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
|
||||
FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-31-1.9-x86_64-CHECKSUM"
|
||||
FEDORA_BASE_IMAGE_NAME: 'fedora-cloud-base-31-1-9'
|
||||
FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-20200406.n.0.x86_64.qcow2"
|
||||
FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/32/Cloud/x86_64/images/Fedora-Cloud-32-x86_64-20200406.n.0-CHECKSUM"
|
||||
FEDORA_BASE_IMAGE_NAME: 'fedora-cloud-base-32-n-0'
|
||||
|
||||
# Prior Fedora release
|
||||
PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2"
|
||||
PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-30-1.2-x86_64-CHECKSUM"
|
||||
PRIOR_FEDORA_BASE_IMAGE_NAME: 'fedora-cloud-base-30-1-2'
|
||||
PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
|
||||
PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-31-1.9-x86_64-CHECKSUM"
|
||||
PRIOR_FEDORA_BASE_IMAGE_NAME: 'fedora-cloud-base-31-1-9'
|
||||
|
||||
# The name of the image in GCE used for packer build libpod_images.yml
|
||||
IBI_BASE_NAME: 'image-builder-image'
|
||||
|
|
|
@ -51,12 +51,12 @@ builders:
|
|||
source_image_family: 'prior-ubuntu-base'
|
||||
|
||||
- <<: *gce_hosted_image
|
||||
name: 'fedora-31'
|
||||
name: 'fedora-32'
|
||||
source_image: '{{user `FEDORA_BASE_IMAGE`}}'
|
||||
source_image_family: 'fedora-base'
|
||||
|
||||
- <<: *gce_hosted_image
|
||||
name: 'fedora-30'
|
||||
name: 'fedora-31'
|
||||
source_image: '{{user `PRIOR_FEDORA_BASE_IMAGE`}}'
|
||||
source_image_family: 'prior-fedora-base'
|
||||
|
||||
|
|
|
@ -52,6 +52,7 @@ INSTALL_PACKAGES=(\
|
|||
bash-completion
|
||||
bison
|
||||
build-essential
|
||||
buildah
|
||||
bzip2
|
||||
conmon
|
||||
containernetworking-plugins
|
||||
|
@ -152,8 +153,6 @@ echo "Installing general testing and system dependencies"
|
|||
$LILTO $SUDOAPTGET update
|
||||
$BIGTO $SUDOAPTGET install ${INSTALL_PACKAGES[@]}
|
||||
|
||||
install_buildah_packages
|
||||
|
||||
echo "Installing cataonit and libseccomp.sudo"
|
||||
ooe.sh sudo /tmp/libpod/hack/install_catatonit.sh
|
||||
ooe.sh sudo make -C /tmp/libpod install.libseccomp.sudo
|
||||
|
|
|
@ -47,10 +47,12 @@ case "${OS_RELEASE_ID}" in
|
|||
bash "$SCRIPT_BASE/add_second_partition.sh"
|
||||
fi
|
||||
|
||||
warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
|
||||
warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
|
||||
echo "mq-deadline" > /sys/block/sda/queue/scheduler
|
||||
cat /sys/block/sda/queue/scheduler
|
||||
if [[ $OS_RELEASE_VER -le 31 ]]; then
|
||||
warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
|
||||
warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
|
||||
echo "mq-deadline" > /sys/block/sda/queue/scheduler
|
||||
cat /sys/block/sda/queue/scheduler
|
||||
fi
|
||||
|
||||
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
|
||||
bash "$SCRIPT_BASE/add_second_partition.sh"
|
||||
|
|
Loading…
Reference in a new issue