airship/images
Code Issues Proposed changes

Specify matching MAC address for ISO test

Browse Source 
ISO login restored when testing with sample cloud-init data in libvirt.

Stop any prior running VM of the same name before rebuilding new images.

Change-Id: I2e67de64368619e00ad2228fdd43118ba2461b9e
This commit is contained in:
Anderson, Craig (ca846m)
2021-02-21 15:28:22 -08:00
parent 6ee9e7b97d
commit 39358b3850
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
image-builder/tools/cut_image.sh
View File

@@ -65,6 +65,9 @@ fi
if [[ $build_type = iso ]]; then if [[ $build_type = iso ]]; then
: ${img_name:=ephemeral.iso} : ${img_name:=ephemeral.iso}
if sudo virsh list | grep ${img_name}; then
sudo virsh destroy ${img_name}
fi
iso_config=/tmp/${img_name}_config iso_config=/tmp/${img_name}_config
echo "user_data: echo "user_data:
$(cat $user_data | sed 's/^/ /g') $(cat $user_data | sed 's/^/ /g')
@@ -84,8 +87,12 @@ outputFileName: $img_name" > ${iso_config}
--env NO_PROXY=$noproxy \ --env NO_PROXY=$noproxy \
${image} < ${iso_config} ${image} < ${iso_config}
disk1="--disk path=${workdir}/${img_name},device=cdrom" disk1="--disk path=${workdir}/${img_name},device=cdrom"
network='--network network=default,mac=52:54:00:6c:99:85'
elif [[ $build_type == qcow ]]; then elif [[ $build_type == qcow ]]; then
: ${img_name:=airship-ubuntu.qcow2} : ${img_name:=airship-ubuntu.qcow2}
if sudo virsh list | grep ${img_name}; then
sudo virsh destroy ${img_name}
fi
sudo -E modprobe nbd sudo -E modprobe nbd
qcow_config=/tmp/${img_name}_config qcow_config=/tmp/${img_name}_config
echo "osconfig: echo "osconfig:
@@ -117,6 +124,7 @@ outputFileName: $img_name" > ${qcow_config}
sudo -E cloud-localds -v --network-config="${cloud_init_config_dir}/network-config" "${workdir}/${img_name}_config.iso" "${cloud_init_config_dir}/user-data" "${cloud_init_config_dir}/meta-data" sudo -E cloud-localds -v --network-config="${cloud_init_config_dir}/network-config" "${workdir}/${img_name}_config.iso" "${cloud_init_config_dir}/user-data" "${cloud_init_config_dir}/meta-data"
disk1="--disk path=${workdir}/${img_name}" disk1="--disk path=${workdir}/${img_name}"
disk2="--disk path=${workdir}/${img_name}_config.iso,device=cdrom" disk2="--disk path=${workdir}/${img_name}_config.iso,device=cdrom"
network='--network network=default'
else else
echo Unknown build type: $build_type, exiting. echo Unknown build type: $build_type, exiting.
exit 1 exit 1
@@ -131,7 +139,6 @@ sudo -E virsh undefine ${img_name} --nvram 2> /dev/null || true
cpu_type='' cpu_type=''
kvm-ok >& /dev/null && cpu_type='--cpu host-passthrough' || true kvm-ok >& /dev/null && cpu_type='--cpu host-passthrough' || true
network='--network network=default'
if ! sudo -E virsh net-list | grep default | grep active > /dev/null; then if ! sudo -E virsh net-list | grep default | grep active > /dev/null; then
network='--network none' network='--network none'
fi fi