davidlt/fedora-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kiwi-build, tmt: Require setting the kiwi filename for the build

Browse Source 
In preparation for having multiple top-level kiwi description files,
expose the ability to define which file to read.

Additionally, tests are updated to use this new flag.
This commit is contained in:
Neal Gompa 2024-08-09 10:49:58 -04:00
parent 40e3039216
commit c4d19f7f8e
17 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -19,7 +19,7 @@ Set up your development environment and run the image build (substitute `<image_
# Install kiwi
[]$ sudo dnf --assumeyes install kiwi
# Run the image build
[]$ sudo ./kiwi-build --image-type=<image_type> --image-profile=<image_profile> --output-dir ./outdir
[]$ sudo ./kiwi-build --kiwi-file=Fedora.kiwi --image-type=<image_type> --image-profile=<image_profile> --output-dir ./outdir
```
## CI information

2
VARIANTS.md
View File

@ -1,5 +1,7 @@
## Image variants
### For the `Fedora.kiwi` kiwi file
| Name | Image type | Image profiles |
|--------------------------------|------------|----------------------------------|
| Base Cloud Edition for clouds | `oem` | `Cloud-Base-Generic` |

19
kiwi-build
View File

@ -8,28 +8,31 @@ set -eu -o pipefail
kiwibuildsh="$(basename "$0")"
usage() {
echo >&2 "usage: $kiwibuildsh [--kiwi-description-dir=DIR] [--isolated] --output-dir=DIR --image-type=TYPE --image-profile=PROFILE [--debug]"
echo >&2 " eg: $kiwibuildsh --kiwi-description-dir=/var/tmp/desc --output-dir=/var/tmp/work --image-type=oem --image-profile=Cloud-Base-Generic --debug"
echo >&2 "usage: $kiwibuildsh [--kiwi-description-dir=DIR] [--kiwi-file=FILE] [--isolated] --output-dir=DIR --image-type=TYPE --image-profile=PROFILE [--debug]"
echo >&2 " eg: $kiwibuildsh --kiwi-description-dir=/var/tmp/desc --kiwi-file=config.kiwi --output-dir=/var/tmp/work --image-type=oem --image-profile=Cloud-Base-Generic --debug"
echo >&2 " eg: $kiwibuildsh --output-dir=/var/tmp/work --image-type=oem --image-profile=Cloud-Base-Generic"
echo >&2 " eg: $kiwibuildsh --isolated --output-dir=/var/tmp/work --image-type=oem --image-profile=Cloud-Base-Generic"
exit 255
}
optTemp=$(getopt --options '+k:,i,o:,t:,p:,d,h' --longoptions 'isolated,kiwi-description-dir:,output-dir:,image-type:,image-profile:,debug,help' --name "$kiwibuildsh" -- "$@")
optTemp=$(getopt --options '+k:,f:,i,o:,t:,p:,d,h' --longoptions 'kiwi-description-dir:,kiwi-file:,isolated,output-dir:,image-type:,image-profile:,debug,help' --name "$kiwibuildsh" -- "$@")
eval set -- "$optTemp"
unset optTemp
kiwi_isolated=
kiwi_description_dir="./"
output_dir=
image_type=
image_profile=
debug=
kiwi_isolated=
# For compatibility with older scripts where these did not exist
kiwi_description_dir="./"
kiwi_file="Fedora.kiwi"
while true; do
case "$1" in
-i|--isolated) kiwi_isolated=1; shift ;;
-k|--kiwi-description-dir) kiwi_description_dir="$2" ; shift 2 ;;
-f|--kiwi-file) kiwi_file="$2" ; shift 2 ;;
-o|--output-dir) output_dir="$2" ; shift 2 ;;
-t|--image-type) image_type="$2" ; shift 2 ;;
-p|--image-profile) image_profile="$2" ; shift 2 ;;
@ -39,7 +42,7 @@ while true; do
esac
done
if [ -z "$output_dir" ] || [ -z "$image_type" ] || [ -z "$image_profile" ]; then
if [ -z "$output_dir" ] || [ -z "$image_type" ] || [ -z "$image_profile" ] || [ -z "$kiwi_file" ]; then
echo "Options not set!"
usage
fi
@ -54,9 +57,9 @@ fi
set +e
if [ ! ${kiwi_isolated} ]; then
kiwi-ng ${debug} --type="${image_type}" --profile="${image_profile}" --color-output system build --description "${kiwi_description_dir}" --target-dir "${output_dir}"
kiwi-ng ${debug} --type="${image_type}" --profile="${image_profile}" --kiwi-file="${kiwi_file}" --color-output system build --description "${kiwi_description_dir}" --target-dir "${output_dir}"
else
kiwi-ng ${debug} --type="${image_type}" --profile="${image_profile}" --color-output system boxbuild --box universal --sshfs-sharing -- --description "${kiwi_description_dir}" --target-dir "${output_dir}"
kiwi-ng ${debug} --type="${image_type}" --profile="${image_profile}" --kiwi-file="${kiwi_file}" --color-output system boxbuild --box universal --sshfs-sharing -- --description "${kiwi_description_dir}" --target-dir "${output_dir}"
fi
kiwi_status=$?
set -e

1
tmt/plans/cloud/base/build-aws.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-AmazonEC2
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/cloud/base/build-azure.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-Azure
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/cloud/base/build-gcp.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-GCE
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/cloud/base/build-generic.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-Generic
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/cloud/base/build-uefi-uki.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-UEFI-UKI
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/container/base/build-generic-init.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oci
image_profile: Container-Base-Generic-Init
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/container/base/build-generic-minimal.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oci
image_profile: Container-Base-Generic-Minimal
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/container/base/build-generic.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oci
image_profile: Container-Base-Generic
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/container/toolbox/build-toolbox.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oci
image_profile: Container-Toolbox
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/desktop/kde/build-desktop-disk.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: KDE-Desktop-Disk
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/desktop/kde/build-desktop-live.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: iso
image_profile: KDE-Desktop-Live
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/vagrant/base/build-libvirt.fmf
View File

@ -4,5 +4,6 @@ discover:
environment:
image_type: oem
image_profile: Cloud-Base-Vagrant-libvirt
kiwi_file: Fedora.kiwi
execute:
how: tmt

1
tmt/plans/vagrant/base/build-virtualbox.fmf
View File

@ -7,5 +7,6 @@ adjust:
environment:
image_type: oem
image_profile: Cloud-Base-Vagrant-VirtualBox
kiwi_file: Fedora.kiwi
execute:
how: tmt

2
tmt/tests/build-image.fmf
View File

@ -9,6 +9,6 @@ require:
framework: shell
path: /
test: |
./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --output-dir="${TMT_TEST_DATA}"
./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --kiwi-file="$kiwi_file" --output-dir="${TMT_TEST_DATA}"
rm -rf "${TMT_TEST_DATA}/build/image-root"
duration: 60m