Skip to content

Commit 54d3495

Browse files
HuijingHeijbtrystram
authored andcommitted
Update config to run Intel TDX test
Update config to run SNP test and add Intel TDX test. See coreos/fedora-coreos-config#3356
1 parent 84a9fbb commit 54d3495

File tree

1 file changed

+25
-7
lines changed

1 file changed

+25
-7
lines changed

jobs/kola-gcp.Jenkinsfile

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,46 @@ cosaPod(memory: "512Mi", kvm: false,
8484
--gcp-project=${gcp_project}""")
8585
}
8686
if (params.ARCH == "x86_64") {
87-
parallelruns['Kola:Confidential'] = {
88-
def tests = params.KOLA_TESTS
89-
if (tests == "") {
90-
tests = "basic"
91-
}
87+
def tests = params.KOLA_TESTS
88+
if (tests == "") {
89+
tests = "basic"
90+
}
91+
parallelruns['Kola:Confidential-SNP'] = {
9292
// https://github.com/coreos/fedora-coreos-tracker/issues/1202
9393
def confidential_tests = tests
9494
if (confidential_tests == "basic") {
95-
confidential_tests = "basic ext.config.platforms.gcp.confidential-vm-tdx-nvme-symlink ext.config.platforms.gcp.confidential-vm-snp-nvme-symlink"
95+
confidential_tests = "basic ext.config.platforms.gcp.confidential-vm-snp-nvme-symlink"
9696
}
9797
// https://github.com/coreos/coreos-assembler/issues/3556
9898
kola(cosaDir: env.WORKSPACE,
9999
build: params.VERSION, arch: params.ARCH,
100100
extraArgs: confidential_tests,
101101
skipUpgrade: true,
102102
skipKolaTags: stream_info.skip_kola_tags,
103-
marker: "confidential",
103+
marker: "confidential-snp",
104104
platformArgs: """-p=gcp \
105105
--gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \
106106
--gcp-project=${gcp_project} \
107107
--gcp-confidential-type sev_snp""")
108108
}
109+
parallelruns['Kola:Confidential-TDX'] = {
110+
// https://github.com/coreos/fedora-coreos-tracker/issues/1202
111+
def confidential_tests = tests
112+
if (confidential_tests == "basic") {
113+
confidential_tests = "basic ext.config.platforms.gcp.confidential-vm-tdx-nvme-symlink"
114+
}
115+
// https://github.com/coreos/coreos-assembler/issues/3556
116+
kola(cosaDir: env.WORKSPACE,
117+
build: params.VERSION, arch: params.ARCH,
118+
extraArgs: confidential_tests,
119+
skipUpgrade: true,
120+
skipKolaTags: stream_info.skip_kola_tags,
121+
marker: "confidential-tdx",
122+
platformArgs: """-p=gcp \
123+
--gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \
124+
--gcp-project=${gcp_project} \
125+
--gcp-confidential-type tdx""")
126+
}
109127
}
110128

111129
// process this batch

0 commit comments

Comments
 (0)