sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zuul 2022-07-12 16:29:16 +00:00 committed by Gerrit Code Review
commit ba88a12456
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

@ -127,6 +127,10 @@
nodepool_diskimage: nodepool_diskimage:
base_element : fedora-container base_element : fedora-container
release: '36' 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: - job:
name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
@ -140,6 +144,10 @@
nodepool_diskimage: nodepool_diskimage:
base_element: rocky-container base_element: rocky-container
release: '8' 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: - job:
name: dib-nodepool-functional-openstack-ubuntu-xenial-src 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 \ $TMP_HOOKS_PATH/bin/cache-url \
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
pushd $DIB_IMAGE_CACHE 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 \ $TMP_HOOKS_PATH/bin/cache-url -f \
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE $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
fi fi
IMAGE_PATH=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE IMAGE_PATH=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE