Add linux-image-azure-lts-18.04, esm and fips.

LIS · Jun 17, 2021 · abac36e · abac36e
1 parent 9a78101
commit abac36e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation b/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation
@@ -155,7 +155,7 @@ properties ([
     parameters([
         choice (name: 'Distro', choices: 'trusty\nxenial\nbionic\nfocal\ngroovy\nhirsute',
                 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 '),
-        choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge',
+        choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge\nlinux-image-azure-lts-18.04\nesm\nlinux-azure-fips',
                 description: 'linux-azure - latest proposed linux-azure kernel validation <br> linux-azure-edge - latest proposed linux-azure-edge kernel validation'),
         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.'),
         choice (name: 'ValidationAzure', choices: 'yes\nno',
@@ -203,9 +203,9 @@ def AZURE_PERFORMANCE_TESTS_HASH = [PERF_NTTTCP:"-TestNames 'PERF-NETWORK-TCP-TH
 LATEST_VERSION_LOCATION="/home/lisa/latest_versions.sh"
 LABEL_SRIOV = "sriov_mlnx"
 LABEL_WS2016 = "ubuntu_azure_kernel_validation"
-LISAV2_REMOTE = "https://github.com/lis/LISAv2.git"
-LISAV2_BRANCH = "master"
-AZURE_LOCATION_DEFAULT = ""
+LISAV2_REMOTE = "https://github.com/LiliDeng/LISAv2.git"
+LISAV2_BRANCH = "fix_issues"
+AZURE_LOCATION_DEFAULT = "westus2"
 AZURE_LOCATION_NVME = "westus2"
 AZURE_LOCATION_SGX = "uksouth"
 AZURE_LOCATION_TVM = "southcentralus"
@@ -217,9 +217,18 @@ def HYPERV_VHD = HYPERV_VHD_HASH.find{it.key == env.distro}.value
 if (env.KernelType == "linux-azure") {
     env.KERNEL_TYPE = "proposed-azure"
 }
-if (env.KernelType == "linux-azure-edge"){
+if (env.KernelType == "linux-azure-edge") {
     env.KERNEL_TYPE = "proposed-edge"
 }
+if (env.KernelType == "linux-image-azure-lts-18.04") {
+    env.KERNEL_TYPE = "linux-image-azure-lts-18.04"
+}
+if (env.KernelType == "esm") {
+    env.KERNEL_TYPE = "esm"
+}
+if (env.KernelType == "linux-azure-fips") {
+    env.KERNEL_TYPE = "linux-azure-fips"
+}
 
 env.START_DATE = new java.sql.Timestamp(new Date().getTime())
 env.END_DATE = ""
@@ -543,8 +552,14 @@ node ("meta_slave") {
     echo "Send email with kernel validation results link"
     if (env.KernelType == "linux-azure") {
         version_identifier = "_azure"
-    } else {
+    } else if (env.KernelType == "linux-azure-edge") {
         version_identifier = "_edge"
+    } else if (env.KernelType == "linux-image-azure-lts-18.04") {
+        version_identifier = "_azure_lts_1804"
+    } else if (env.KernelType == "esm") {
+        version_identifier = "_esm"
+    } else if (env.KernelType == "linux-azure-fips") {
+        version_identifier = "_azure_fips"
     }
     def kernels_info = ""
     try {

diff --git a/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_watcher b/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_watcher
@@ -40,7 +40,7 @@ node ("meta_slave") {
                     SEND_MAIL = "yes"
                     println "TRIGGERING the testing for ${distro} distro, ${kernel} kernel - ${latest_kernel_version}"
                     MESSAGE_LIST = MESSAGE_LIST + "<br>${distro} ${latest_kernel_version} ${kernel} kernel, "
-                    build (job: "${env.PIPELINE_NAME}/master",
+                    build (job: "${env.PIPELINE_NAME}/PR-624",
                         parameters: [
                             string(name: 'Distro', value: "${distro}"),
                             string(name: 'KernelType', value: "${kernel}"),

diff --git a/scripts/ubuntu_azure_kernel/ubuntu_azure_kernel_watcher.sh b/scripts/ubuntu_azure_kernel/ubuntu_azure_kernel_watcher.sh
@@ -29,10 +29,11 @@ function Search_New_Kernel() {
     old_kernel_version=$3
     if [ ${kernel_type} == "linux-azure" ]; then
         kernel_type_short="_azure"
-    else
+    elif [ ${kernel_type} == "linux-azure-edge" ]; then
         kernel_type_short="_edge"
+    elif [ ${kernel_type} == "linux-image-azure-lts-18.04" ]; then
+        kernel_type_short="_azure_lts_1804"
     fi
-
     latest_kernel=$(sudo apt-cache madison ${kernel_type} | grep ${release}-proposed | awk '{print $3}')
     if [ ! -z $latest_kernel ]; then
         echo "Latest $kernel_type Kernel for $release is $latest_kernel"
@@ -107,13 +108,19 @@ for release in ${RELEASES[@]}; do
     azure_release="${!variable_name}"
     variable_name="${release}_edge"
     edge_release="${!variable_name}"
+    variable_name="${release}_azure_lts_1804"
+    azure_lts_1804_release="${!variable_name}"
 
     latest_azure=$(sudo apt-cache madison linux-azure | grep ${release}-proposed | awk '{print $3}')
     latest_edge=$(sudo apt-cache madison linux-azure-edge | grep ${release}-proposed | awk '{print $3}')
+    latest_azure_lts_1804=$(sudo apt-cache madison linux-image-azure-lts-18.04 | grep ${release}-proposed | awk '{print $3}')
 
     # Check linux-azure proposed kernel for a new version
     Search_New_Kernel $release "linux-azure" $azure_release
 
     # Check linux-azure-edge proposed kernel for a new version
     Search_New_Kernel $release "linux-azure-edge" $edge_release
+
+    # Check linux-image-azure-lts-18.04 proposed kernel for a new version
+    Search_New_Kernel $release "linux-image-azure-lts-18.04" $azure_lts_1804_release
 done