Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 9236f33

Browse files
LiliDengLiliDeng
committed
Add linux-image-azure-fde.
1 parent 46afd31 commit 9236f33

File tree

2 files changed

+74
-14
lines changed

2 files changed

+74
-14
lines changed

‎linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ properties ([
155155
parameters([
156156
choice (name: 'Distro', choices: 'trusty\nxenial\nbionic\nfocal\ngroovy\nhirsute',
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\nlinux-azure-edge\nlinux-image-azure-lts-18.04\nesm\nlinux-azure-fips\nlinux-image-azure-lts-20.04\n',
158+
choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge\nlinux-image-azure-lts-18.04\nesm\nlinux-azure-fips\nlinux-image-azure-lts-20.04\nlinux-image-azure-fde\n',
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\nno',
@@ -232,6 +232,9 @@ if (env.KernelType == "linux-azure-fips") {
232232
if (env.KernelType == "linux-image-azure-lts-20.04") {
233233
env.KERNEL_TYPE = "linux-image-azure-lts-20.04"
234234
}
235+
if (env.KernelType == "linux-image-azure-fde") {
236+
env.KERNEL_TYPE = "linux-image-azure-fde"
237+
}
235238

236239
env.START_DATE = new java.sql.Timestamp(new Date().getTime())
237240
env.END_DATE = ""
@@ -333,6 +336,19 @@ if (env.ValidationAzure == 'yes') {
333336
" -ExitWithZero -ForceCustom" +
334337
" ${test_cmd}"
335338
)
339+
} else if ('${KERNEL_TYPE}' == "linux-image-azure-fde") {
340+
echo "Run-LisaV2.ps1 -TestPlatform 'Azure' -ARMImageName '${ARM_GEN2_DISTRO}' -RGIdentifier '${AZURE_ID}' -TestLocation '${AZURE_LOCATION}' -CustomKernel '${KERNEL_TYPE}' ${test_cmd} -XMLSecretFile '${Azure_Secrets_File}'"
341+
RunPowershellCommand(".\\Run-LisaV2.ps1" +
342+
" -TestLocation '${AZURE_LOCATION}'" +
343+
" -RGIdentifier '${AZURE_ID}'" +
344+
" -TestPlatform 'Azure'" +
345+
" -CustomKernel '${KERNEL_TYPE}'" +
346+
" -ARMImageName '${ARM_GEN2_DISTRO}'" +
347+
" -XMLSecretFile '${Azure_Secrets_File}'" +
348+
" -EnableTelemetry" +
349+
" -ExitWithZero -ForceCustom" +
350+
" ${test_cmd}"
351+
)
336352
} else {
337353
echo "Run-LisaV2.ps1 -TestPlatform 'Azure' -ARMImageName '${ARM_DISTRO}' -RGIdentifier '${AZURE_ID}' -TestLocation '${AZURE_LOCATION}' -CustomKernel '${KERNEL_TYPE}' ${test_cmd} -XMLSecretFile '${Azure_Secrets_File}'"
338354
RunPowershellCommand(".\\Run-LisaV2.ps1" +
@@ -506,20 +522,54 @@ if (env.PerformanceAzure == "yes") {
506522
} catch (exc) {
507523
println exc
508524
}
525+
def ARM_GEN2_DISTRO = ""
526+
script {
527+
if ("${env.distro}" == "bionic") {
528+
ARM_GEN2_DISTRO = "Canonical UbuntuServer 18_04-lts-gen2 latest"
529+
}
530+
if ("${env.distro}" == "xenial") {
531+
ARM_GEN2_DISTRO = "Canonical UbuntuServer 16_04-lts-gen2 latest"
532+
}
533+
if ("${env.distro}" == "focal") {
534+
ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-focal 20_04-lts-gen2 latest"
535+
}
536+
if ("${env.distro}" == "groovy") {
537+
ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-groovy 20_10-gen2 latest"
538+
}
539+
if ("${env.distro}" == "hirsute") {
540+
ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-hirsute 21_04-gen2 latest"
541+
}
542+
}
509543

510-
echo "Run-LisaV2.ps1 -TestPlatform 'Azure' -ARMImageName '${ARM_DISTRO}' -RGIdentifier '${AZURE_ID}' -TestLocation '${AZURE_LOCATION_DEFAULT}' -CustomKernel '${KERNEL_TYPE}' ${test_cmd} -XMLSecretFile '${Azure_Secrets_File}'"
511-
RunPowershellCommand(".\\Run-LisaV2.ps1" +
512-
" -TestLocation '${AZURE_LOCATION_DEFAULT}'" +
513-
" -RGIdentifier '${AZURE_ID}'" +
514-
" -TestPlatform 'Azure'" +
515-
" -CustomKernel '${KERNEL_TYPE}'" +
516-
" -ARMImageName '${ARM_DISTRO}'" +
517-
" -XMLSecretFile '${Azure_Secrets_File}'" +
518-
" -EnableTelemetry" +
519-
" -ExitWithZero -ForceCustom" +
520-
" -ResultDBTestTag '${env.distro}_${env.KernelType}_${env.BUILD_NUMBER}'" +
521-
" ${test_cmd}"
522-
)
544+
if ('${KERNEL_TYPE}' == "linux-image-azure-fde") {
545+
echo "Run-LisaV2.ps1 -TestPlatform 'Azure' -ARMImageName '${ARM_GEN2_DISTRO}' -RGIdentifier '${AZURE_ID}' -TestLocation '${AZURE_LOCATION_DEFAULT}' -CustomKernel '${KERNEL_TYPE}' ${test_cmd} -XMLSecretFile '${Azure_Secrets_File}'"
546+
RunPowershellCommand(".\\Run-LisaV2.ps1" +
547+
" -TestLocation '${AZURE_LOCATION_DEFAULT}'" +
548+
" -RGIdentifier '${AZURE_ID}'" +
549+
" -TestPlatform 'Azure'" +
550+
" -CustomKernel '${KERNEL_TYPE}'" +
551+
" -ARMImageName '${ARM_GEN2_DISTRO}'" +
552+
" -XMLSecretFile '${Azure_Secrets_File}'" +
553+
" -EnableTelemetry" +
554+
" -ExitWithZero -ForceCustom" +
555+
" -ResultDBTestTag '${env.distro}_${env.KernelType}_${env.BUILD_NUMBER}'" +
556+
" ${test_cmd}"
557+
)
558+
} else {
559+
echo "Run-LisaV2.ps1 -TestPlatform 'Azure' -ARMImageName '${ARM_DISTRO}' -RGIdentifier '${AZURE_ID}' -TestLocation '${AZURE_LOCATION_DEFAULT}' -CustomKernel '${KERNEL_TYPE}' ${test_cmd} -XMLSecretFile '${Azure_Secrets_File}'"
560+
RunPowershellCommand(".\\Run-LisaV2.ps1" +
561+
" -TestLocation '${AZURE_LOCATION_DEFAULT}'" +
562+
" -RGIdentifier '${AZURE_ID}'" +
563+
" -TestPlatform 'Azure'" +
564+
" -CustomKernel '${KERNEL_TYPE}'" +
565+
" -ARMImageName '${ARM_DISTRO}'" +
566+
" -XMLSecretFile '${Azure_Secrets_File}'" +
567+
" -EnableTelemetry" +
568+
" -ExitWithZero -ForceCustom" +
569+
" -ResultDBTestTag '${env.distro}_${env.KernelType}_${env.BUILD_NUMBER}'" +
570+
" ${test_cmd}"
571+
)
572+
}
523573
archiveArtifacts artifacts: '*-TestLogs.zip', allowEmptyArchive: true
524574
junit testResults: "Report\\*-junit.xml", allowEmptyResults: true
525575

@@ -565,6 +615,8 @@ node ("meta_slave") {
565615
version_identifier = "_azure_fips"
566616
} else if (env.KernelType == "linux-image-azure-lts-20.04") {
567617
version_identifier = "_azure_lts_2004"
618+
} else if (env.KernelType == "linux-image-azure-fde") {
619+
version_identifier = "_azure_fde"
568620
}
569621
def kernels_info = ""
570622
try {

‎scripts/ubuntu_azure_kernel/ubuntu_azure_kernel_watcher.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ function Search_New_Kernel() {
3535
kernel_type_short="_azure_lts_1804"
3636
elif [ ${kernel_type} == "linux-image-azure-lts-20.04" ]; then
3737
kernel_type_short="_azure_lts_2004"
38+
elif [ ${kernel_type} == "linux-image-azure-fde" ]; then
39+
kernel_type_short="_azure_fde"
3840
fi
3941
latest_kernel=$(sudo apt-cache madison ${kernel_type} | grep ${release}-proposed | awk '{print $3}')
4042
if [ ! -z $latest_kernel ]; then
@@ -114,11 +116,14 @@ for release in ${RELEASES[@]}; do
114116
azure_lts_1804_release="${!variable_name}"
115117
variable_name="${release}_azure_lts_2004"
116118
azure_lts_2004_release="${!variable_name}"
119+
variable_name="${release}_azure_fde"
120+
azure_fde_release="${!variable_name}"
117121

118122
latest_azure=$(sudo apt-cache madison linux-azure | grep ${release}-proposed | awk '{print $3}')
119123
latest_edge=$(sudo apt-cache madison linux-azure-edge | grep ${release}-proposed | awk '{print $3}')
120124
latest_azure_lts_1804=$(sudo apt-cache madison linux-image-azure-lts-18.04 | grep ${release}-proposed | awk '{print $3}')
121125
latest_azure_lts_2004=$(sudo apt-cache madison linux-image-azure-lts-20.04 | grep ${release}-proposed | awk '{print $3}')
126+
latest_azure_fde=$(sudo apt-cache madison linux-image-azure-fde | grep ${release}-proposed | awk '{print $3}')
122127

123128
# Check linux-azure proposed kernel for a new version
124129
Search_New_Kernel $release "linux-azure" $azure_release
@@ -131,4 +136,7 @@ for release in ${RELEASES[@]}; do
131136

132137
# Check linux-image-azure-lts-20.04 proposed kernel for a new version
133138
Search_New_Kernel $release "linux-image-azure-lts-20.04" $latest_azure_lts_2004
139+
140+
# Check linux-image-azure-fde proposed kernel for a new version
141+
Search_New_Kernel $release "linux-image-azure-fde" $latest_azure_fde
134142
done

0 commit comments

Comments
 (0)