| Message ID | 20230214153842.15637-6-michal.orzel@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: dom0less arm32 testing | expand |
On Tue, 14 Feb 2023, Michal Orzel wrote: > Add a new test job qemu-smoke-dom0less-arm32-gcc-without-dom0 in debug > and non-debug variant that will execute qemu-smoke-dom0less-arm32.sh > script to test dom0less domU boot without dom0 (i.e. true dom0less > configuration). > > By passing "without-dom0" as a test variant, the test will clear the > dom0 prompt that we grep for as a last step and remove all the DOM0 > related options in ImageBuilder configuration. > > Signed-off-by: Michal Orzel <michal.orzel@amd.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > Changes in v2: > - new patch created as a result of deciding to keep dom0 by default. We still > need to test true dom0less configuration, hence added a new test. > --- > automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ > automation/scripts/qemu-smoke-dom0less-arm32.sh | 13 +++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml > index be7a55d89708..c0b4a90e0d29 100644 > --- a/automation/gitlab-ci/test.yaml > +++ b/automation/gitlab-ci/test.yaml > @@ -258,6 +258,22 @@ qemu-smoke-dom0less-arm32-gcc-debug-gzip: > - *arm32-test-needs > - debian-unstable-gcc-arm32-debug > > +qemu-smoke-dom0less-arm32-gcc-without-dom0: > + extends: .qemu-arm32 > + script: > + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} > + needs: > + - *arm32-test-needs > + - debian-unstable-gcc-arm32 > + > +qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: > + extends: .qemu-arm32 > + script: > + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} > + needs: > + - *arm32-test-needs > + - debian-unstable-gcc-arm32-debug > + > qemu-alpine-x86_64-gcc: > extends: .qemu-x86-64 > script: > diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh > index c2e331451d99..cc91238f4222 100755 > --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh > +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh > @@ -42,6 +42,15 @@ echo \"${passed}\" > " > fi > > +if [[ "${test_variant}" == "without-dom0" ]]; then > + # Clear dom0 prompt > + dom0_prompt="" > + passed="${test_variant} test passed" > + domU_check=" > +echo \"${passed}\" > +" > +fi > + > # dom0/domU rootfs > # We are using the same rootfs for dom0 and domU. The only difference is > # that for the former, we set explictly rdinit to /bin/sh, whereas for the > @@ -102,6 +111,10 @@ if [[ "${test_variant}" == "gzip" ]]; then > sed -i 's/DOMU_KERNEL\[0\]=.*/DOMU_KERNEL\[0\]="vmlinuz.gz"/' config > fi > > +if [[ "${test_variant}" == "without-dom0" ]]; then > + sed -i '/^DOM0/d' config > +fi > + > rm -rf imagebuilder > git clone https://gitlab.com/ViryaOS/imagebuilder > bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config > -- > 2.25.1 >
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index be7a55d89708..c0b4a90e0d29 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -258,6 +258,22 @@ qemu-smoke-dom0less-arm32-gcc-debug-gzip: - *arm32-test-needs - debian-unstable-gcc-arm32-debug +qemu-smoke-dom0less-arm32-gcc-without-dom0: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32 + +qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-debug + qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 script: diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index c2e331451d99..cc91238f4222 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -42,6 +42,15 @@ echo \"${passed}\" " fi +if [[ "${test_variant}" == "without-dom0" ]]; then + # Clear dom0 prompt + dom0_prompt="" + passed="${test_variant} test passed" + domU_check=" +echo \"${passed}\" +" +fi + # dom0/domU rootfs # We are using the same rootfs for dom0 and domU. The only difference is # that for the former, we set explictly rdinit to /bin/sh, whereas for the @@ -102,6 +111,10 @@ if [[ "${test_variant}" == "gzip" ]]; then sed -i 's/DOMU_KERNEL\[0\]=.*/DOMU_KERNEL\[0\]="vmlinuz.gz"/' config fi +if [[ "${test_variant}" == "without-dom0" ]]; then + sed -i '/^DOM0/d' config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config
Add a new test job qemu-smoke-dom0less-arm32-gcc-without-dom0 in debug and non-debug variant that will execute qemu-smoke-dom0less-arm32.sh script to test dom0less domU boot without dom0 (i.e. true dom0less configuration). By passing "without-dom0" as a test variant, the test will clear the dom0 prompt that we grep for as a last step and remove all the DOM0 related options in ImageBuilder configuration. Signed-off-by: Michal Orzel <michal.orzel@amd.com> --- Changes in v2: - new patch created as a result of deciding to keep dom0 by default. We still need to test true dom0less configuration, hence added a new test. --- automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ automation/scripts/qemu-smoke-dom0less-arm32.sh | 13 +++++++++++++ 2 files changed, 29 insertions(+)