Cyber/releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issues/10'

Browse source 
* issues/10:
  Add function to copy iPXE binaries
  Increase timeout for copying artifacts
  Add ipxe to list of packages for VM
This commit is contained in:
David Runge 2021-05-15 20:57:54 +02:00
parent 7dd8e7412a c555e1b8a4
commit b0f975c904
No known key found for this signature in database
GPG key ID: 7258734B41C31549
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -5,8 +5,9 @@ include:
variables:
BUILD_SCRIPT: ./.gitlab/ci/build_releng.sh
PACKAGE_LIST: archiso erofs-utils openssl zsync
PACKAGE_LIST: archiso erofs-utils ipxe openssl zsync
QEMU_BUILD_TIMEOUT: 2400
QEMU_COPY_ARTIFACTS_TIMEOUT: 120
QEMU_VM_MEMORY: 3072
ARCHISO_COW_SPACE_SIZE: 2g

27
.gitlab/ci/build_releng.sh
View file

@ -5,8 +5,8 @@
# The script needs to be run as root and assumes $PWD to be the root of the repository.
#
# Dependencies:
# * all archiso dependencies
# * coreutils
# * archiso
# * gawk
# * gnupg
# * openssl
# * zsync
@ -106,8 +106,13 @@ create_metrics() {
{
# metrics on build environment
printf 'archiso_version %s\n' "$(pacman -Q archiso |cut -d' ' -f2 | cut -d '-' -f1)"
printf 'version_info{package="archiso",name="Version of archiso used for build",version="%s"} 1\n' \
"$(pacman -Q archiso |cut -d' ' -f2)"
printf 'version_info{package="ipxe",name="Version of iPXE binaries",version="%s"} 1\n' \
"$(pacman -Q ipxe |cut -d' ' -f2)"
# create metrics per buildmode
printf 'version_info{package="linux",name="Version of Linux used in image",version="%s"} 1\n' \
"$(file "${output}/arch/boot/"*/vmlinuz-linux| cut -d',' -f2| awk '{print $2}')"
printf 'size_mebibytes{buildmode="iso",artifact="iso"} %s\n' \
"$(du -m -- "${output}/"*.iso | cut -f1)"
printf 'package_count{buildmode="iso"} %s\n' \
@ -203,6 +208,19 @@ create_ephemeral_codesigning_key() {
print_section_end "ephemeral_codesigning_key"
}
copy_ipxe_binaries() {
# copy ipxe binaries to output dir
local _ipxe_base="/usr/share/ipxe"
local _ipxe_output="${output}/ipxe"
print_section_start "copy_ipxe" "Copy iPXE binaries"
install -vdm 755 -- "${_ipxe_output}"
cp -av -- "${_ipxe_base}/"{ipxe-arch.{lkrn,pxe},x86_64/ipxe-arch.efi} "${_ipxe_output}"
print_section_end "copy_ipxe"
}
run_mkarchiso() {
# run mkarchiso
create_ephemeral_pgp_key
@ -222,8 +240,9 @@ run_mkarchiso() {
print_section_end "mkarchiso"
copy_ipxe_binaries
create_zsync_delta "${output}/"*+(.iso|.tar|.gz|.xz|.zst)
create_checksums "${output}/"*+(.iso|.tar|.gz|.xz|.zst)
create_checksums "${output}/"*+(.iso|.tar|.gz|.xz|.zst) "${output}/ipxe/"*.{efi,lkrn,pxe}
create_metrics
print_section_start "ownership" "Setting ownership on output"