@@ -155,7 +155,7 @@ properties ([
155155 parameters([
156156 choice (name : ' Distro' , choices : ' trusty\n xenial\n bionic\n focal\n groovy\n hirsute' ,
157157 description : ' trusty - 14.04 validation <br> xenial - 16.04 validation <br> bionic - 18.04 validation <br> focal - 20.04 validation <br> groovy - 20.10 validation <br> hirsute - 21.04 validation ' ),
158- choice (name : ' KernelType' , choices : ' linux-azure\n linux-azure-edge' ,
158+ choice (name : ' KernelType' , choices : ' linux-azure\n linux-azure-edge\n linux-image-azure-lts-18.04 \n esm \n linux-azure-fips ' ,
159159 description : ' linux-azure - latest proposed linux-azure kernel validation <br> linux-azure-edge - latest proposed linux-azure-edge kernel validation' ),
160160 string(name : ' KernelVersion' , defaultValue : " " , description : ' The exact kernel version to be tested. Example: 5.0.0.1010.9. If left empty, the latest kernel version for the selected distro/kernel type will be used.' ),
161161 choice (name : ' ValidationAzure' , choices : ' yes\n no' ,
@@ -203,9 +203,9 @@ def AZURE_PERFORMANCE_TESTS_HASH = [PERF_NTTTCP:"-TestNames 'PERF-NETWORK-TCP-TH
203203LATEST_VERSION_LOCATION = " /home/lisa/latest_versions.sh"
204204LABEL_SRIOV = " sriov_mlnx"
205205LABEL_WS2016 = " ubuntu_azure_kernel_validation"
206- LISAV2_REMOTE = " https://github.com/lis /LISAv2.git"
207- LISAV2_BRANCH = " master "
208- AZURE_LOCATION_DEFAULT = " "
206+ LISAV2_REMOTE = " https://github.com/LiliDeng /LISAv2.git"
207+ LISAV2_BRANCH = " fix_issues "
208+ AZURE_LOCATION_DEFAULT = " westus2 "
209209AZURE_LOCATION_NVME = " westus2"
210210AZURE_LOCATION_SGX = " uksouth"
211211AZURE_LOCATION_TVM = " southcentralus"
@@ -217,9 +217,18 @@ def HYPERV_VHD = HYPERV_VHD_HASH.find{it.key == env.distro}.value
217217if (env.KernelType == " linux-azure" ) {
218218 env. KERNEL_TYPE = " proposed-azure"
219219}
220- if (env.KernelType == " linux-azure-edge" ){
220+ if (env.KernelType == " linux-azure-edge" ) {
221221 env. KERNEL_TYPE = " proposed-edge"
222222}
223+ if (env.KernelType == " linux-image-azure-lts-18.04" ) {
224+ env. KERNEL_TYPE = " linux-image-azure-lts-18.04"
225+ }
226+ if (env.KernelType == " esm" ) {
227+ env. KERNEL_TYPE = " esm"
228+ }
229+ if (env.KernelType == " linux-azure-fips" ) {
230+ env. KERNEL_TYPE = " linux-azure-fips"
231+ }
223232
224233env. START_DATE = new java.sql.Timestamp (new Date (). getTime())
225234env. END_DATE = " "
@@ -543,8 +552,14 @@ node ("meta_slave") {
543552 echo " Send email with kernel validation results link"
544553 if (env.KernelType == " linux-azure" ) {
545554 version_identifier = " _azure"
546- } else {
555+ } else if ( env.KernelType == " linux-azure-edge " ) {
547556 version_identifier = " _edge"
557+ } else if (env.KernelType == " linux-image-azure-lts-18.04" ) {
558+ version_identifier = " _azure_lts_1804"
559+ } else if (env.KernelType == " esm" ) {
560+ version_identifier = " _esm"
561+ } else if (env.KernelType == " linux-azure-fips" ) {
562+ version_identifier = " _azure_fips"
548563 }
549564 def kernels_info = " "
550565 try {
0 commit comments