Skip to content

Commit

Permalink
ci/openqa: fix tests for images based on SLMicro 6.1
Browse files Browse the repository at this point in the history 
- Use the same Medium for GA and Update Elemental images
- Refactor Elemental to simplify the testing and release process
- Move SLMicro 5.3/5.4 to as separate file definition, as they are not
  part of Elemental

Signed-off-by: Loic Devulder <ldevulder@suse.com>
  • Loading branch information
@ldevulder
ldevulder committed Oct 10, 2024
1 parent fa65769 commit 4bdcca5
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 206 deletions.
211 changes: 172 additions & 39 deletions tests/assets/openqa_elemental_jobgroup.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,34 @@

.default_products: &default_products
distri: sle-micro
version: '6.0'

.default_settings: &default_settings
.test_settings: &test_settings
HDDSIZEGB: '20'
PASSWORD: ros
QEMURAM: '2048'
PASSWORD: ros
TEST_PASSWORD: Elemental@R00t
YAML_SCHEDULE: schedule/elemental/test_image.yaml

.generate_settings: &generate_settings
BOOT_HDD_IMAGE: "1"
CONTAINER_RUNTIMES: "podman"
DESKTOP: "textmode"
EXCLUDE_MODULES: "suseconnect_scc"
HDD_1: "SL-Micro.%ARCH%-6.0.0-Default-Updated.qcow2"
KEEP_GRUB_TIMEOUT: "0"
TEST_PASSWORD: Elemental@R00t
YAML_SCHEDULE: schedule/elemental/iso.yaml
VIDEOMODE: "text"
YAML_SCHEDULE: schedule/elemental/validate_generate_image.yaml

.image_test_settings: &image_test_settings
HDD_1: 'elemental-%BUILD%-%ARCH%.qcow2'
IMAGE_TYPE: disk
START_AFTER_TEST: generate_image

.iso_test_settings: &iso_test_settings
IMAGE_TYPE: iso
ISO: 'elemental-%BUILD%-%ARCH%.iso'
START_AFTER_TEST: generate_iso

defaults:
aarch64:
Expand All @@ -32,63 +52,176 @@ defaults:
QEMUCPU: host

products:
sl-micro-baremetal-aarch64:
sle-micro-elemental-image-5.5-aarch64:
<<: *default_products
flavor: Elemental-Image
version: '5.5'
sle-micro-elemental-iso-5.5-aarch64:
<<: *default_products
flavor: Elemental-Iso
version: '5.5'
sle-micro-elemental-image-5.5-x86_64:
<<: *default_products
flavor: Elemental-Image
version: '5.5'
sle-micro-elemental-iso-5.5-x86_64:
<<: *default_products
flavor: Elemental-Iso
version: '5.5'
sl-micro-elemental-image-6.0-aarch64:
<<: *default_products
flavor: Elemental-Image
version: '6.0'
sl-micro-elemental-iso-6.0-aarch64:
<<: *default_products
flavor: Elemental-baremetal
sl-micro-base-aarch64:
flavor: Elemental-Iso
version: '6.0'
sl-micro-elemental-image-6.0-x86_64:
<<: *default_products
flavor: Elemental-base
sl-micro-kvm-aarch64:
flavor: Elemental-Image
version: '6.0'
sl-micro-elemental-iso-6.0-x86_64:
<<: *default_products
flavor: Elemental-kvm
sl-micro-baremetal-x86_64:
flavor: Elemental-Iso
version: '6.0'
sl-micro-elemental-image-6.1-aarch64:
<<: *default_products
flavor: Elemental-baremetal
sl-micro-base-x86_64:
flavor: Elemental-Image
version: '6.1'
sl-micro-elemental-iso-6.1-aarch64:
<<: *default_products
flavor: Elemental-base
sl-micro-kvm-x86_64:
flavor: Elemental-Iso
version: '6.1'
sl-micro-elemental-image-6.1-x86_64:
<<: *default_products
flavor: Elemental-kvm
sl-micro-rt-x86_64:
flavor: Elemental-Image
version: '6.1'
sl-micro-elemental-iso-6.1-x86_64:
<<: *default_products
flavor: Elemental-rt
flavor: Elemental-Iso
version : '6.1'

scenarios:
aarch64:
sl-micro-baremetal-aarch64:
- elemental_iso:
sle-micro-elemental-image-5.5-aarch64:
- generate_image:
testsuite: null
settings:
<<: *generate_settings
sle-micro-elemental-iso-5.5-aarch64:
- generate_iso:
testsuite: null
settings:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *test_settings
<<: *iso_test_settings
sl-micro-elemental-image-6.0-aarch64:
- generate_image:
testsuite: null
settings:
<<: *generate_settings
- test_image:
testsuite: null
settings:
<<: *test_settings
<<: *image_test_settings
sl-micro-elemental-iso-6.0-aarch64:
- generate_iso:
testsuite: null
settings:
<<: *default_settings
sl-micro-base-aarch64:
- elemental_iso:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *default_settings
sl-micro-kvm-aarch64:
- elemental_iso:
<<: *test_settings
<<: *iso_test_settings
sl-micro-elemental-image-6.1-aarch64:
- generate_image:
testsuite: null
settings:
<<: *default_settings
<<: *generate_settings
- test_image:
testsuite: null
settings:
<<: *test_settings
<<: *image_test_settings
sl-micro-elemental-iso-6.1-aarch64:
- generate_iso:
testsuite: null
settings:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *test_settings
<<: *iso_test_settings
x86_64:
sl-micro-baremetal-x86_64:
- elemental_iso:
sle-micro-elemental-image-5.5-x86_64:
- generate_image:
machine: 64bit
testsuite: null
settings:
<<: *generate_settings
sle-micro-elemental-iso-5.5-x86_64:
- generate_iso:
machine: 64bit
testsuite: null
settings:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *test_settings
<<: *iso_test_settings
START_AFTER_TEST: generate_iso@64bit
sl-micro-elemental-image-6.0-x86_64:
- generate_image:
machine: 64bit
testsuite: null
settings:
<<: *generate_settings
- test_image:
testsuite: null
settings:
<<: *test_settings
<<: *image_test_settings
START_AFTER_TEST: generate_image@64bit
sl-micro-elemental-iso-6.0-x86_64:
- generate_iso:
machine: 64bit
testsuite: null
settings:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *test_settings
<<: *iso_test_settings
START_AFTER_TEST: generate_iso@64bit
sl-micro-elemental-image-6.1-x86_64:
- generate_image:
machine: 64bit
testsuite: null
settings:
<<: *default_settings
sl-micro-base-x86_64:
- elemental_iso:
<<: *generate_settings
- test_image:
testsuite: null
settings:
<<: *default_settings
sl-micro-kvm-x86_64:
- elemental_iso:
<<: *test_settings
<<: *image_test_settings
START_AFTER_TEST: generate_image@64bit
sl-micro-elemental-iso-6.1-x86_64:
- generate_iso:
machine: 64bit
testsuite: null
settings:
<<: *default_settings
sl-micro-rt-x86_64:
- elemental_iso:
<<: *generate_settings
- test_iso:
testsuite: null
settings:
<<: *default_settings
<<: *test_settings
<<: *iso_test_settings
START_AFTER_TEST: generate_iso@64bit
Loading

0 comments on commit 4bdcca5

Please sign in to comment.