openstack
/
diskimage-builder
Code Issues Proposed changes

ubuntu: more exact match on squashfs file, containerfile: use focal 

This is a squash of two changes that have unfortunately simultaneously
broken the gate.

The functests are failing with

 sha256sum: bionic-server-cloudimg-amd64.squashfs.manifest: No such file or directory

I think what has happened here is that the SHA256 sums file being used
has got a new entry "bionic-server-cloudimg-amd64.squashfs.manifest"
which is showing up in a grep for
"bionic-server-cloudimg-amd64.squashfs".  sha256 then tries to also
check this hash, and has started failing.

To avoid this, add an EOL marker to the grep so it only matches the
exact filename.

Change I7fb585bc5ccc52803eea107e76dddf5e9fde8646 updated the
containerfile tests to Jammy and it seems that cgroups v2 prevents
podman running inside docker [1].  While we investigate, move this
testing back to focal.

[1] https://github.com/containers/podman/issues/14884
Change-Id: I1af9f5599168aadc1e7fcdfae281935e6211a597
This commit is contained in:
Ian Wienand 2022-07-11 15:12:41 +10:00
parent cdf931d190
commit 78d389526c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.d/jobs.yaml
View File

@ -126,6 +126,10 @@
nodepool_diskimage:
base_element : fedora-container
release: '36'
# NOTE(ianw) 2022-07-11 : something in jammy has broken running
# podman inside docker. Investigations continue, but force this
# back for now.
nodeset: ubuntu-focal
- job:
name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
@ -139,6 +143,10 @@
nodepool_diskimage:
base_element: rocky-container
release: '8'
# NOTE(ianw) 2022-07-11 : something in jammy has broken running
# podman inside docker. Investigations continue, but force this
# back for now.
nodeset: ubuntu-focal
- job:
name: dib-nodepool-functional-openstack-ubuntu-xenial-src

4
diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
View File

@ -41,10 +41,10 @@ function get_ubuntu_tarball() {
$TMP_HOOKS_PATH/bin/cache-url \
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
pushd $DIB_IMAGE_CACHE
if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then
if ! grep "${BASE_IMAGE_FILE}$" $CACHED_SUMS | sha256sum --check - ; then
$TMP_HOOKS_PATH/bin/cache-url -f \
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check -
grep "${BASE_IMAGE_FILE}$" $CACHED_SUMS | sha256sum --check -
fi
fi
IMAGE_PATH=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE