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

Commit 4a34aef

Browse files
committed
Add linux-image-azure-lts-18.04, esm and fips.
1 parent 420f1b8 commit 4a34aef

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation

Lines changed: 20 additions & 5 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',
158+
choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge\nlinux-image-azure-lts-18.04\nesm\nlinux-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\nno',
@@ -203,8 +203,8 @@ def AZURE_PERFORMANCE_TESTS_HASH = [PERF_NTTTCP:"-TestNames 'PERF-NETWORK-TCP-TH
203203
LATEST_VERSION_LOCATION="/home/lisa/latest_versions.sh"
204204
LABEL_SRIOV = "sriov_mlnx"
205205
LABEL_WS2016 = "ubuntu_azure_kernel_validation"
206-
LISAV2_REMOTE = "https://github.com/lis/LISAv2.git"
207-
LISAV2_BRANCH = "master"
206+
LISAV2_REMOTE = "https://github.com/LiliDeng/LISAv2.git"
207+
LISAV2_BRANCH = "fix_issues"
208208
AZURE_LOCATION_DEFAULT = "westus2"
209209
AZURE_LOCATION_NVME = "westus2"
210210
AZURE_LOCATION_SGX = "uksouth"
@@ -217,9 +217,18 @@ def HYPERV_VHD = HYPERV_VHD_HASH.find{it.key == env.distro}.value
217217
if (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

224233
env.START_DATE = new java.sql.Timestamp(new Date().getTime())
225234
env.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 {

linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_watcher

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ node ("meta_slave") {
4040
SEND_MAIL = "yes"
4141
println "TRIGGERING the testing for ${distro} distro, ${kernel} kernel - ${latest_kernel_version}"
4242
MESSAGE_LIST = MESSAGE_LIST + "<br>${distro} ${latest_kernel_version} ${kernel} kernel, "
43-
build (job: "${env.PIPELINE_NAME}/master",
43+
build (job: "${env.PIPELINE_NAME}/PR-624",
4444
parameters: [
4545
string(name: 'Distro', value: "${distro}"),
4646
string(name: 'KernelType', value: "${kernel}"),

scripts/ubuntu_azure_kernel/ubuntu_azure_kernel_watcher.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ function Search_New_Kernel() {
2929
old_kernel_version=$3
3030
if [ ${kernel_type} == "linux-azure" ]; then
3131
kernel_type_short="_azure"
32-
else
32+
elif [ ${kernel_type} == "linux-azure-edge" ]; then
3333
kernel_type_short="_edge"
34+
elif [ ${kernel_type} == "linux-image-azure-lts-18.04" ]; then
35+
kernel_type_short="_azure_lts_1804"
3436
fi
35-
3637
latest_kernel=$(sudo apt-cache madison ${kernel_type} | grep ${release}-proposed | awk '{print $3}')
3738
if [ ! -z $latest_kernel ]; then
3839
echo "Latest $kernel_type Kernel for $release is $latest_kernel"
@@ -107,13 +108,19 @@ for release in ${RELEASES[@]}; do
107108
azure_release="${!variable_name}"
108109
variable_name="${release}_edge"
109110
edge_release="${!variable_name}"
111+
variable_name="${release}_azure_lts_1804"
112+
azure_lts_1804_release="${!variable_name}"
110113

111114
latest_azure=$(sudo apt-cache madison linux-azure | grep ${release}-proposed | awk '{print $3}')
112115
latest_edge=$(sudo apt-cache madison linux-azure-edge | grep ${release}-proposed | awk '{print $3}')
116+
latest_azure_lts_1804=$(sudo apt-cache madison linux-image-azure-lts-18.04 | grep ${release}-proposed | awk '{print $3}')
113117

114118
# Check linux-azure proposed kernel for a new version
115119
Search_New_Kernel $release "linux-azure" $azure_release
116120

117121
# Check linux-azure-edge proposed kernel for a new version
118122
Search_New_Kernel $release "linux-azure-edge" $edge_release
123+
124+
# Check linux-image-azure-lts-18.04 proposed kernel for a new version
125+
Search_New_Kernel $release "linux-image-azure-lts-18.04" $azure_lts_1804_release
119126
done

0 commit comments

Comments
 (0)