Use debian-cloud-images build script with AVF class
Bug: 363237196
Test: check if output contains tree which is declared in AVF class
Change-Id: I4cf1267632042cb93c9976067be1cb2f5b4d618e
diff --git a/build/debian/build.sh b/build/debian/build.sh
index aab85d6..9136a67 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -69,31 +69,13 @@
local dst=${config_space}
cp -R ${src}/* ${dst}
+ cp $(dirname $0)/image.yaml ${resources_dir}
}
run_fai() {
- local cspace=${config_space}
local out=${built_image}
- local classes=(
- BASE
- DEBIAN
- NOCLOUD
- ARM64
- LINUX_VERSION_BASE+LINUX_VARIANT_CLOUD
- ${debian_version^^} # uppercase
- AVF
- BUILD_IMAGE
- SYSTEM_BOOT
- )
- # join by comma
- classes=$(IFS=","; echo "${classes[*]}")
-
- fai-diskimage \
- --verbose \
- --size 2G \
- --class ${classes} \
- --cspace ${cspace} \
- ${out}
+ make -C ${debian_cloud_image} image_bookworm_nocloud_arm64
+ mv ${debian_cloud_image}/image_bookworm_nocloud_arm64.raw ${out}
}
clean_up() {
@@ -108,7 +90,7 @@
debian_cloud_image=${workdir}/debian_cloud_image
debian_version=bookworm
config_space=${debian_cloud_image}/config_space/${debian_version}
-
+resources_dir=${debian_cloud_image}/src/debian_cloud_images/resources
check_sudo
parse_options $@
install_prerequisites
diff --git a/build/debian/image.yaml b/build/debian/image.yaml
new file mode 100644
index 0000000..eb42a07
--- /dev/null
+++ b/build/debian/image.yaml
@@ -0,0 +1,60 @@
+# After modifications, please call:
+# "python3 -m debian_cloud_images.cli.generate_ci .gitlab/ci/generated.yml"
+---
+apiVersion: cloud.debian.org/v1alpha1
+kind: ImageConfig
+
+archs:
+- name: amd64
+ azureName: X64
+ ociArch: amd64
+ faiClasses: [AMD64]
+- name: arm64
+ azureName: Arm64
+ ociArch: arm64
+ faiClasses: [ARM64]
+- name: ppc64el
+ faiClasses: [PPC64EL]
+ ociArch: ppc64le
+- name: riscv64
+ faiClasses: [RISCV64]
+ ociArch: riscv64
+
+releases:
+- name: bookworm
+ basename: bookworm
+ id: '12'
+ baseid: '12'
+ faiClasses: [BOOKWORM, LINUX_VERSION_BASE, EXTRAS]
+ matches:
+ - matchArches: [amd64, arm64, ppc64el]
+- name: bookworm-backports
+ basename: bookworm-backports
+ id: 12-backports
+ baseid: '12'
+ faiClasses: [BOOKWORM, LINUX_VERSION_BACKPORTS, EXTRAS]
+ matches:
+ - matchArches: [amd64, arm64, ppc64el]
+- name: trixie
+ basename: trixie
+ id: '13'
+ baseid: '13'
+ faiClasses: [TRIXIE, LINUX_VERSION_BASE, EXTRAS]
+ matches:
+ - matchArches: [amd64, arm64, ppc64el]
+
+vendors:
+- name: nocloud
+ faiClasses: [SYSTEM_BOOT, NOCLOUD, LINUX_VARIANT_BASE, TIME_SYSTEMD, AVF]
+ size: 2
+
+types:
+- name: dev
+ faiClasses: [TYPE_DEV]
+ outputName: 'debian-{release}-{vendor}-{arch}-{build_type}-{build_id}-{version}'
+ outputVersion: '{version}'
+ outputVersionAzure: '0.0.{version!s}'
+- name: official
+ outputName: 'debian-{release}-{vendor}-{arch}-{build_type}-{version}'
+ outputVersion: '{date}-{version}'
+ outputVersionAzure: '0.{date!s}.{version!s}'