mirror of
https://github.com/containers/udica
synced 2024-05-10 23:36:11 +02:00
Cirrus: Update CI VM images
Note F35 is disabled due to golang 1.18 requirement in podman. The PRIOR_FEDORA... runs may be put back in place when F37 is released. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
parent
e7a4418143
commit
bd32eaf43e
17
.cirrus.yml
17
.cirrus.yml
|
@ -16,13 +16,13 @@ env:
|
|||
####
|
||||
#### Cache-image names to test with
|
||||
####
|
||||
FEDORA_NAME: "fedora-34"
|
||||
PRIOR_FEDORA_NAME: "fedora-33"
|
||||
FEDORA_NAME: "fedora-36"
|
||||
#PRIOR_FEDORA_NAME: "fedora-35"
|
||||
|
||||
# Google-cloud VM Images
|
||||
IMAGE_SUFFIX: "c6431352024203264"
|
||||
IMAGE_SUFFIX: "c5473162832904192"
|
||||
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
|
||||
#PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
|
||||
|
||||
####
|
||||
#### Command variables to help avoid duplication
|
||||
|
@ -58,9 +58,9 @@ test_upstream_podman_task:
|
|||
- name: "Test podman on ${FEDORA_NAME}"
|
||||
gce_instance:
|
||||
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
|
||||
- name: "Test podman on ${PRIOR_FEDORA_NAME}"
|
||||
gce_instance:
|
||||
image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
|
||||
# - name: "Test podman on ${PRIOR_FEDORA_NAME}"
|
||||
# gce_instance:
|
||||
# image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
|
||||
|
||||
env:
|
||||
# Which branch, tag, or sha of podman repository to test against
|
||||
|
@ -87,9 +87,10 @@ meta_task:
|
|||
|
||||
env:
|
||||
# Space-separated list of ALL images used by automation in this repository
|
||||
# TODO: F35 removed from CI testing due to golang 1.18 requirements
|
||||
# restore after F37 released + re-add below: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
|
||||
IMGNAMES: |-
|
||||
${FEDORA_CACHE_IMAGE_NAME}
|
||||
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
|
||||
BUILDID: "${CIRRUS_BUILD_ID}"
|
||||
REPOREF: "${CIRRUS_REPO_NAME}"
|
||||
GCPJSON: ENCRYPTED[5279a6043ee3852dabbf477cda0565183d3f0d887dde63a19ebe19eb00f9b279a8a5f4d2d7395672cb7d7046b9da11d2]
|
||||
|
|
|
@ -20,8 +20,10 @@ showrun make
|
|||
showrun make install PREFIX=/usr ETCDIR=/etc
|
||||
|
||||
echo "Configuring podman for execution w/in a container"
|
||||
sed -r -i -e 's/^driver.+overlay.+/driver = "vfs"/g' /etc/containers/storage.conf
|
||||
sed -r -i -e 's/^mountopt =.+/mountopt = ""/g' /etc/containers/storage.conf
|
||||
sed -e 's|^#mount_program|mount_program|g' \
|
||||
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
|
||||
/usr/share/containers/storage.conf \
|
||||
> /etc/containers/storage.conf
|
||||
setsebool container_manage_cgroup true # systemd in container
|
||||
|
||||
echo "Installing Udica from source"
|
||||
|
|
|
@ -8,15 +8,10 @@ show_env_vars
|
|||
|
||||
case "${OS_RELEASE_ID}" in
|
||||
fedora)
|
||||
msg "Expanding root disk space"
|
||||
growpart /dev/sda 1
|
||||
resize2fs /dev/sda1
|
||||
msg "Installing necessary additional packages"
|
||||
ooe.sh dnf install -y \
|
||||
python3 \
|
||||
setools-console \
|
||||
systemd-devel \
|
||||
container-selinux
|
||||
systemd-devel
|
||||
;;
|
||||
*) bad_os_id_ver ;;
|
||||
esac
|
||||
|
|
Loading…
Reference in New Issue