Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPt630 tests #2

Open
wants to merge 33 commits into
base: 3mdeb-lab
Choose a base branch
from
+853 −41
Open

HPt630 tests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e04a46b
3mdeb-templates.json: Update products to qubes R4.2.3
philipandag Jan 23, 2025
e91f059
3mdeb-templates.json: Update AEM packages
philipandag Jan 23, 2025
11375e0
3mdeb-templates.json: Add new producsts & machines
philipandag Jan 23, 2025
d4cba72
3mdeb-templates: Update jobgroups
philipandag Jan 27, 2025
c263ca0
generalhw: hpt630v1: Add
philipandag Jan 27, 2025
de34bea
generalhw/hpt630v1: Add +x to scripts
philipandag Jan 27, 2025
4fd460d
generalhw/hpt630v1/power: Fix parsing action to sonoff api
philipandag Jan 27, 2025
23af81e
3mdeb-templates: Update MAX_ISO_SIZE
philipandag Jan 27, 2025
75b3ec4
3mdeb-templates: Add "legacy_boot" key to jobs with legacy boot
philipandag Jan 27, 2025
3ee1206
needles: HP GRUB bootmenu needles
philipandag Jan 28, 2025
298ab73
install_partitioning_default: check for install over existing
philipandag Jan 28, 2025
6bc8db4
firstboot & 3mdeb-templates: Workaround for missing video in lukspass
philipandag Feb 3, 2025
e42c64c
3mdeb-templates.json: Set TIMEOUT_SCALE for hpt630v1 machine
philipandag Feb 3, 2025
ff4d340
tests/aem_hw.pm: Support HPt630v1
philipandag Feb 3, 2025
7311cd4
3mdeb-templates: Add SKL_VER to aem-setup test suite
philipandag Feb 3, 2025
9d015ba
tests/aem_hw.pm: Running Qubes: update grub traversal
philipandag Feb 4, 2025
a39000e
aem_hw.pm: Workaround for missing signal on lukspass
philipandag Feb 4, 2025
fd2a597
aem_hw: Set corect boot partition depending on legacy/efi boot
philipandag Feb 4, 2025
c951bfb
aem_hw: Do lukspass no signal workaround in loop to save time
philipandag Feb 4, 2025
77a5104
aem_hw: Don't do grub2-install on efi systems
philipandag Feb 4, 2025
3d94db9
needles: Add needles for aem_hw clearing TPM on HPt630v1
philipandag Feb 5, 2025
2a79832
aem_hw.pm: Change poweroff to reboot on the end of `run`
philipandag Feb 4, 2025
8cdd2a3
aem_hw: clear_tpm_hp: Add verifying TPM is still enabled after clear
philipandag Feb 4, 2025
cdc14e6
aem_hw: Adjust installed packages depending on Legacy/EFI boot
philipandag Feb 4, 2025
540243e
needles: Add needles to verify TPM enabled on HP
philipandag Feb 4, 2025
b1331d2
3mdeb-templates: Fix XEN_VER for installation test suite
philipandag Feb 4, 2025
ea4c6c8
3mdeb-templates: Seperate test suites into Legacy/UEFI versions
philipandag Feb 4, 2025
eebfab1
3mdeb-templates: Update START_AFTER for EFI/legacy test variants
philipandag Feb 5, 2025
620c76e
hpt630v1/power: Add delay after power off
philipandag Feb 5, 2025
5adeb88
generalhw: Generalize hardcoded AEM packages version
philipandag Feb 5, 2025
d0776fa
hpt630v1/power: Use $1 for sonoff ip instead of hardcoding it
philipandag Feb 5, 2025
d759221
hpt630v1/ks.cfg: Add `spec-ctrl=no-ibpb-entry` for xen
philipandag Feb 5, 2025
fa5d277
aem_hw.pm: Fix comment on optional grub2-install call
philipandag Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
258 changes: 241 additions & 17 deletions 3mdeb-templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Products" : [
{
"version" : "4.2",
"version" : "4.2.3",
"arch" : "x86_64",
"flavor" : "install-iso",
"settings" : [],
Expand All @@ -11,27 +11,81 @@
"flavor" : "install-iso-iommu",
"settings" : [],
"distri" : "qubesos",
"version" : "4.2",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-hw",
"version" : "4.2",
"version" : "4.2.3",
"arch" : "x86_64"
},

{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-optiplex",
"version" : "4.2",
"flavor" : "install-iso-optiplex-legacy",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-optiplex-uefi",
"version" : "4.2.3",
"arch" : "x86_64"
},

{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-vp46xx-legacy",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-vp46xx-uefi",
"version" : "4.2.3",
"arch" : "x86_64"
},

{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-hpt630v1-legacy",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-hpt630v1-uefi",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-hpt630v2-legacy",
"version" : "4.2.3",
"arch" : "x86_64"
},
{
"settings" : [],
"distri" : "qubesos",
"flavor" : "install-iso-hpt630v2-uefi",
"version" : "4.2.3",
"arch" : "x86_64"
}


],
"JobGroups" : [
{
"template" : "defaults:\n x86_64:\n machine: qemu\n priority: 70\nproducts:\n qubesos-4.2-install-iso-x86_64:\n distri: qubesos\n flavor: install-iso\n version: '4.2'\n qubesos-4.2-install-iso-iommu-x86_64:\n distri: qubesos\n flavor: install-iso-iommu\n version: '4.2'\n qubesos-4.2-install-iso-hw-x86_64:\n distri: qubesos\n flavor: install-iso-hw\n version: '4.2'\n qubesos-4.2-install-iso-optiplex-x86_64:\n distri: qubesos\n flavor: install-iso-optiplex\n version: '4.2'\nscenarios:\n x86_64:\n qubesos-4.2-install-iso-x86_64:\n - test-suite\n qubesos-4.2-install-iso-iommu-x86_64:\n - test-suite:\n machine: qemu-iommu\n qubesos-4.2-install-iso-hw-x86_64:\n - test-suite:\n machine: msi\n qubesos-4.2-install-iso-optiplex-x86_64:\n - installation:\n machine: optiplex\n - aem-setup:\n machine: optiplex\n - aem-first-run:\n machine: optiplex\n - aem-second-run:\n machine: optiplex\n",
"template" : "defaults:\n x86_64:\n machine: qemu\n priority: 70\nproducts:\n qubesos-4.2.3-install-iso-x86_64:\n distri: qubesos\n flavor: install-iso\n version: '4.2.3'\n qubesos-4.2.3-install-iso-iommu-x86_64:\n distri: qubesos\n flavor: install-iso-iommu\n version: '4.2.3'\n qubesos-4.2.3-install-iso-hw-x86_64:\n distri: qubesos\n flavor: install-iso-hw\n version: '4.2.3'\n qubesos-4.2.3-install-iso-optiplex-legacy-x86_64:\n distri: qubesos\n flavor: install-iso-optiplex-legacy\n version: '4.2.3'\n legacy_boot : 'true'\n qubesos-4.2.3-install-iso-optiplex-uefi-x86_64:\n distri: qubesos\n flavor: install-iso-optiplex-uefi\n version: '4.2.3'\n qubesos-4.2.3-install-iso-hpt630v1-legacy-x86_64:\n distri: qubesos\n flavor: install-iso-hpt630v1-legacy\n version: '4.2.3'\n legacy_boot : 'true'\n qubesos-4.2.3-install-iso-hpt630v1-uefi-x86_64:\n distri: qubesos\n flavor: install-iso-hpt630v1-uefi\n version: '4.2.3'\nscenarios:\n x86_64:\n # qubesos-4.2.3-install-iso-x86_64:\n # - test-suite\n # qubesos-4.2.3-install-iso-iommu-x86_64:\n # - test-suite:\n # machine: qemu-iommu\n # qubesos-4.2.3-install-iso-hw-x86_64:\n # - test-suite:\n # machine: msi\n # qubesos-4.2.3-install-iso-optiplex-legacy-x86_64:\n # - installation:\n # machine: optiplex\n # - aem-setup:\n # machine: optiplex\n # - aem-first-run:\n # machine: optiplex\n # - aem-second-run:\n # machine: optiplex\n qubesos-4.2.3-install-iso-hpt630v1-legacy-x86_64:\n - installation:\n machine: hpt630v1\n - aem-setup:\n machine: hpt630v1\n - aem-first-run:\n machine: hpt630v1\n - aem-second-run:\n machine: hpt630v1\n",
"group_name" : "Qubes"
}
],
Expand Down Expand Up @@ -147,6 +201,48 @@
],
"backend" : "generalhw",
"name" : "optiplex"
},
{
"settings" : [
{
"value" : "vp46xx",
"key" : "+WORKER_CLASS"
}
],
"backend" : "generalhw",
"name" : "vp46xx"
},
{
"settings" : [
{
"value" : "hpt630v1",
"key" : "+WORKER_CLASS"
},
{
"key": "LUKSPASS_NO_VIDEO_WORKAROUND",
"value": "1"
},
{
"key": "TIMEOUT_SCALE",
"value": "5"
}
],
"backend" : "generalhw",
"name" : "hpt630v1"
},
{
"settings" : [
{
"value" : "hpt630v2",
"key" : "+WORKER_CLASS"
},
{
"value" : "0",
"key" : "BOOT_MENU"
}
],
"backend" : "generalhw",
"name" : "hpt630v2"
}
],
"JobTemplates" : [],
Expand Down Expand Up @@ -176,15 +272,53 @@
},
{
"key" : "ISO_MAXSIZE",
"value" : "6900372992"
"value" : "6910355456"
},
{
"value" : "1",
"key" : "UEFI"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "0"
}
],
"description" : "Install the system and shut it down. Separate test suite for clarity. UEFI=1 is a workaround.",
"name" : "installation"
"name" : "installation-uefi"
},
{
"settings" : [
{
"key" : "DO_NOTHING",
"value" : "%SKIP_INSTALL%"
},
{
"key" : "HDD_1",
"value" : "%ISO%"
},
{
"key" : "INSTALL_TEMPLATES",
"value" : "fedora"
},
{
"key" : "ISO",
"value" : "Qubes-R%BUILD%-%ARCH%.iso"
},
{
"key" : "ISO_MAXSIZE",
"value" : "6910355456"
},
{
"value" : "1",
"key" : "UEFI"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "1"
}
],
"description" : "Install the system and shut it down. Separate test suite for clarity. UEFI=1 is a workaround.",
"name" : "installation-legacy"
},
{
"settings" : [
Expand All @@ -193,54 +327,144 @@
"value" : "4.2.1-1"
},
{
"value" : "2.06-2",
"value" : "2.13-1",
"key" : "GRUB_VER"
},
{
"key" : "PACKAGES_BASE_URL",
"value" : "https://dl.3mdeb.com/open-source-firmware/QubesOS/trenchboot_aem_v0.3"
"value" : "http://192.168.4.32:8000/rpm/"
},
{
"key" : "START_AFTER_TEST",
"value" : "installation"
"value" : "installation-legacy"
},
{
"value" : "setup",
"key" : "TEST_AEM_HW"
},
{
"value" : "4.17.2-8",
"value" : "4.17.5-5",
"key" : "XEN_VER"
},
{
"key": "SKL_VER",
"value": "0+fafa02165e58aa275421a65e70ae53aae429050c-1"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "1"
}
],
"description" : "Clear TPM, install AEM packages and setup AEM.",
"name" : "aem-setup"
"name" : "aem-setup-legacy"
},
{
"settings" : [
{
"key" : "AEM_VER",
"value" : "4.2.1-1"
},
{
"value" : "2.13-1",
"key" : "GRUB_VER"
},
{
"key" : "PACKAGES_BASE_URL",
"value" : "http://192.168.4.32:8000/rpm/"
},
{
"key" : "START_AFTER_TEST",
"value" : "installation-uefi"
},
{
"value" : "setup",
"key" : "TEST_AEM_HW"
},
{
"value" : "4.17.5-5",
"key" : "XEN_VER"
},
{
"key": "SKL_VER",
"value": "0+fafa02165e58aa275421a65e70ae53aae429050c-1"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "0"
}
],
"description" : "Clear TPM, install AEM packages and setup AEM.",
"name" : "aem-setup-uefi"
},
{
"description" : "Check that AEM unsealed secret successfully and dump TPM event log.",
"settings" : [
{
"value" : "aem-first-run-uefi",
"key" : "START_AFTER_TEST"
},
{
"value" : "second-run",
"key" : "TEST_AEM_HW"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "0"
}
],
"name" : "aem-second-run-uefi"
},
{
"description" : "Check that AEM unsealed secret successfully and dump TPM event log.",
"settings" : [
{
"value" : "aem-first-run",
"value" : "aem-first-run-legacy",
"key" : "START_AFTER_TEST"
},
{
"value" : "second-run",
"key" : "TEST_AEM_HW"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "1"
}
],
"name" : "aem-second-run"
"name" : "aem-second-run-legacy"
},
{
"name" : "aem-first-run-legacy",
"description" : "Check that AEM sealed secret successfully.",
"settings" : [
{
"key" : "START_AFTER_TEST",
"value" : "aem-setup-legacy"
},
{
"key" : "TEST_AEM_HW",
"value" : "first-run"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "1"
}
]
},
{
"name" : "aem-first-run",
"name" : "aem-first-run-uefi",
"description" : "Check that AEM sealed secret successfully.",
"settings" : [
{
"key" : "START_AFTER_TEST",
"value" : "aem-setup"
"value" : "aem-setup-uefi"
},
{
"key" : "TEST_AEM_HW",
"value" : "first-run"
},
{
"key": "OS_INSTALL_LEGACY",
"value": "0"
}
]
}
Expand Down
Loading