From edd65d79ae865dbe18cc0580d8258c8cc8d581e8 Mon Sep 17 00:00:00 2001
From: Unmesh Deodhar <udeodhar@amd.com>
Date: Fri, 16 Jun 2023 11:16:31 -0500
Subject: [PATCH 1/2] job-builder: Add SNP job

Adding SNP job to the job builder so that #5594 in tests can run.

Fixes: #5593

Signed-Off-By: Unmesh Deodhar <udeodhar@amd.com>
---
 jobs-builder/jobs/cc.yaml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/jobs-builder/jobs/cc.yaml b/jobs-builder/jobs/cc.yaml
index db33607..0fcb71c 100644
--- a/jobs-builder/jobs/cc.yaml
+++ b/jobs-builder/jobs/cc.yaml
@@ -364,6 +364,42 @@
     jobs:
       - '{repo}-CCv0-{os}-{arch}-{ci_job}-PR'
       - 'kata-containers-CCv0-{os}-{arch}-{ci_job}-baseline'
+- project:
+    # The node label is selected based on this project name. Be careful if you
+    # need to change the name.
+    name: "Generate jobs for the Confidential Containers Operator on AMD SEV-SNP"
+    os:
+      - ubuntu-20.04_snp
+    arch:
+      - x86_64
+    baremetal: "true"
+    container_runtime:
+      - containerd
+    runtimeclass:
+      - kata-qemu-snp
+    maintainers:
+      - '@UnmeshDeodhar'
+    jobs:
+      - 'confidential-containers-operator-main-{os}-{arch}-{container_runtime}_{runtimeclass}-PR'
+      - 'confidential-containers-operator-main-{os}-{arch}-{container_runtime}_{runtimeclass}-baseline'
+- project:
+    name: "Generate jobs for Confidential Containers on AMD SEV-SNP"
+    repo:
+      - kata-containers
+      - tests
+    os:
+      - ubuntu-20.04_snp
+    arch:
+      - x86_64
+    baremetal: "true"
+    tee: "snp"
+    ci_job:
+      - CC_SNP_CRI_CONTAINERD_K8S
+    maintainers:
+      - '@UnmeshDeodhar'
+    jobs:
+      - '{repo}-CCv0-{os}-{arch}-{ci_job}-PR'
+      - 'kata-containers-CCv0-{os}-{arch}-{ci_job}-baseline'
 
 ###
 # Define stand-alone jobs.

From 96d51f0aa842b1d945c70e0d4da6d523c8a027f3 Mon Sep 17 00:00:00 2001
From: Unmesh Deodhar <udeodhar@amd.com>
Date: Fri, 16 Jun 2023 11:46:45 -0500
Subject: [PATCH 2/2] jobs: Selectin correct node

AMD SEV-SNP is supported on Milan and onwards. Thus, selecting Milan node for the SNP job.

Signed-Off-By: Unmesh Deodhar <udeodhar@amd.com>
---
 jobs-builder/jobs/include/os2node.yaml.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jobs-builder/jobs/include/os2node.yaml.inc b/jobs-builder/jobs/include/os2node.yaml.inc
index 0bed3db..8908188 100644
--- a/jobs-builder/jobs/include/os2node.yaml.inc
+++ b/jobs-builder/jobs/include/os2node.yaml.inc
@@ -13,8 +13,9 @@ ubuntu1804_azure || ubuntu1804-azure
 {%- elif os == "ubuntu-20.04" -%}
 ubuntu_20.04
 {%- elif os == "ubuntu-20.04_sev" -%}
-{# Run Kata and Operator CI jobs on different nodes. #}
-{{- "amd-ubuntu-2004_op-ci" if "Confidential Containers Operator" in name else "amd-ubuntu-2004" -}}
+amd-ubuntu-2004
+{%- elif os == "ubuntu-20.04_snp" -%}
+amd-milan-ubuntu-2004
 {%- elif os == "ubuntu-20.04-ARM" -%}
 arm_node || arm-ubuntu-2004
 {%- endif %}