Merge "ubuntu: more exact match on squashfs file, containerfile: use focal"
This commit is contained in:
commit
ba88a12456
@ -127,6 +127,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
|
||||
@ -140,6 +144,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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user