From 2ef16e824d7b7c9ec081ebb72f42a34c08a18144 Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Mon, 15 Jan 2024 12:23:01 -0600 Subject: [PATCH 1/3] docs: added machine list table and label columns The added machine table links the machine's assigned labels to the jobs required labels. Signed-Off-By: Ryan Savino --- docs/DEVELOPMENT.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index 647a4ce7..2992e68f 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -92,15 +92,25 @@ In order to be merged your opened pull request (PR) should pass the static analy The e2e tests jobs are executed on a variety of CcRuntime, configurations and platforms. These jobs that require confidential hardware (Intel TDX, AMD SEV, IBM SE, etc...) run on bare-metal machines and are often referred as "TEE tests". The remaining tests (a.k.a "Non-TEE") are executed on Virtual Machines (VM) deployed on-demand. +This is a list of the bare-metal machines and VMs that are utilized by the project for CI testing: + +| Machine | Type | TEE Capability | Assigned Labels | +| --- | --- | --- | --- | +| s390x | virtual | Non-TEE | | +| az-ubuntu-2004 | virtual | Non-TEE | | +| az-ubuntu-2204 | virtual | Non-TEE | | + The following jobs will check for regessions on the default CcRuntime: -|Job name | TEE | OS | VMM | -|---|---|---|---| -|e2e-pr / operator tests (kata-qemu, s390x) | Non-TEE | Ubuntu 22.04 (s390x) | QEMU | -|e2e-pr / operator tests (kata-clh, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | Cloud Hypervisor | -|e2e-pr / operator tests (kata-clh, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | Cloud Hypervisor | -|e2e-pr / operator tests (kata-qemu, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | QEMU | -|e2e-pr / operator tests (kata-qemu, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | QEMU | +|Job name | TEE | OS | VMM | Required Labels | +|---|---|---|---|---| +|e2e-pr / operator tests (kata-qemu, s390x) | Non-TEE | Ubuntu 22.04 (s390x) | QEMU | | +|e2e-pr / operator tests (kata-clh, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | Cloud Hypervisor | | +|e2e-pr / operator tests (kata-clh, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | Cloud Hypervisor | | +|e2e-pr / operator tests (kata-qemu, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | QEMU | | +|e2e-pr / operator tests (kata-qemu, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | QEMU | | + +The required labels specified for a job will determine what machine it lands on by matching the machine's assigned labels. Additionally the following jobs will check regressions on the enclave-cc CcRuntime: From 6c7a9354df409d0ee8f17a124998d771ad8f3dc9 Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Mon, 15 Jan 2024 12:27:41 -0600 Subject: [PATCH 2/3] docs: added snp and sev machines, jobs and labels to CI documentation Added the snp and sev machines and jobs to the table with their required and assigned labels. Fixes: #316 Signed-Off-By: Ryan Savino --- docs/DEVELOPMENT.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index 2992e68f..dc804c2f 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -96,6 +96,8 @@ This is a list of the bare-metal machines and VMs that are utilized by the proje | Machine | Type | TEE Capability | Assigned Labels | | --- | --- | --- | --- | +| amd-milan-kata-ci | bare-metal | AMD SNP | amd-milan | +| amd-rome-kata-ci | bare-metal | AMD SEV | amd-rome | | s390x | virtual | Non-TEE | | | az-ubuntu-2004 | virtual | Non-TEE | | | az-ubuntu-2204 | virtual | Non-TEE | | @@ -104,6 +106,8 @@ The following jobs will check for regessions on the default CcRuntime: |Job name | TEE | OS | VMM | Required Labels | |---|---|---|---|---| +| e2e-pr / operator tests (kata-qemu, amd-milan-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-milan | +| e2e-pr / operator tests (kata-qemu, amd-rome-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-rome | |e2e-pr / operator tests (kata-qemu, s390x) | Non-TEE | Ubuntu 22.04 (s390x) | QEMU | | |e2e-pr / operator tests (kata-clh, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | Cloud Hypervisor | | |e2e-pr / operator tests (kata-clh, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | Cloud Hypervisor | | From 0e23b73952278317c9ca565b7ff54708d6e2e9fa Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Wed, 7 Feb 2024 12:34:24 -0600 Subject: [PATCH 3/3] docs: formatting Signed-Off-By: Ryan Savino --- docs/DEVELOPMENT.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index dc804c2f..a99fb262 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -104,15 +104,15 @@ This is a list of the bare-metal machines and VMs that are utilized by the proje The following jobs will check for regessions on the default CcRuntime: -|Job name | TEE | OS | VMM | Required Labels | -|---|---|---|---|---| -| e2e-pr / operator tests (kata-qemu, amd-milan-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-milan | -| e2e-pr / operator tests (kata-qemu, amd-rome-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-rome | -|e2e-pr / operator tests (kata-qemu, s390x) | Non-TEE | Ubuntu 22.04 (s390x) | QEMU | | -|e2e-pr / operator tests (kata-clh, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | Cloud Hypervisor | | -|e2e-pr / operator tests (kata-clh, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | Cloud Hypervisor | | -|e2e-pr / operator tests (kata-qemu, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | QEMU | | -|e2e-pr / operator tests (kata-qemu, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | QEMU | | +|Job name | TEE | OS | VMM | Required Labels | +| --- | --- | --- | --- | --- | +| e2e-pr / operator tests (kata-qemu, amd-milan-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-milan | +| e2e-pr / operator tests (kata-qemu, amd-rome-kata-ci) | AMD SNP | Ubuntu 20.04 | QEMU | amd-rome | +| e2e-pr / operator tests (kata-qemu, s390x) | Non-TEE | Ubuntu 22.04 (s390x) | QEMU | | +| e2e-pr / operator tests (kata-clh, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | Cloud Hypervisor | | +| e2e-pr / operator tests (kata-clh, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | Cloud Hypervisor | | +| e2e-pr / operator tests (kata-qemu, az-ubuntu-2004) | Non-TEE | Ubuntu 20.04 | QEMU | | +| e2e-pr / operator tests (kata-qemu, az-ubuntu-2204) | Non-TEE | Ubuntu 22.04 | QEMU | | The required labels specified for a job will determine what machine it lands on by matching the machine's assigned labels.