CONFIG_TASK_IO_ACCOUNTING depends on CONFIG_TASK_XACCT. (#660)

LIS · Jun 10, 2021 · 9a78101 · 9a78101
1 parent 4ccf5fd
commit 9a78101
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation b/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation
@@ -191,7 +191,7 @@ def AZURE_VALIDATION_TESTS_HASH = [AZURE_P0:"-TestPriority 0 -ExcludeTests '^NVM
     AZURE_P2:"-TestPriority 2 -ExcludeTests '^NVME-*,^PERF-*,TENSORFLOW*,NESTED*,VERIFY-DPDK-NFF-GO,VERIFY-DPDK-OVS,STRESSTEST-NVME-4K-IO'",
     AZURE_NVME:"-TestCategory 'Functional' -TestArea 'NVME'",
     AZURE_SGX:"-TestNames VALIDATE-INTEL-SGX-DRIVER-FOR-DC-VM",
-    AZURE_TVM:"-TestNames TVM-TEST-SECUREBOOT-COMPATIBILITY"]
+    AZURE_TVM:"-TestNames 'TVM-TEST-SECUREBOOT-COMPATIBILITY,TVM-TEST-MEASUREDBOOT-COMPATIBILITY'"]
 
 def AZURE_PERFORMANCE_TESTS_HASH = [PERF_NTTTCP:"-TestNames 'PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-Synthetic,PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-SRIOV' -ResultDBTable 'Perf_Network_TCP_Azure_DefaultKernel'",
     PERF_UDP:"-TestNames 'PERF-NETWORK-UDP-1K-THROUGHPUT-MULTICONNECTION-NTTTCP-Synthetic,PERF-NETWORK-UDP-1K-THROUGHPUT-MULTICONNECTION-NTTTCP-SRIOV' -ResultDBTable 'Perf_Network_UDP_Azure_DefaultKernel'",
@@ -205,7 +205,7 @@ LABEL_SRIOV = "sriov_mlnx"
 LABEL_WS2016 = "ubuntu_azure_kernel_validation"
 LISAV2_REMOTE = "https://github.com/lis/LISAv2.git"
 LISAV2_BRANCH = "master"
-AZURE_LOCATION_DEFAULT = "westus2"
+AZURE_LOCATION_DEFAULT = ""
 AZURE_LOCATION_NVME = "westus2"
 AZURE_LOCATION_SGX = "uksouth"
 AZURE_LOCATION_TVM = "southcentralus"
@@ -286,13 +286,13 @@ if (env.ValidationAzure == 'yes') {
                                                 ARM_GEN2_DISTRO = "Canonical UbuntuServer 16_04-lts-gen2 latest"
                                             }
                                             if ("${env.distro}" == "focal") {
-                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-focal 20_04-lts latest"
+                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-focal 20_04-lts-gen2 latest"
                                             }
                                             if ("${env.distro}" == "groovy") {
-                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-groovy 20_10 latest"
+                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-groovy 20_10-gen2 latest"
                                             }
                                             if ("${env.distro}" == "hirsute") {
-                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-hirsute 21_04 latest"
+                                                ARM_GEN2_DISTRO = "canonical 0001-com-ubuntu-server-hirsute 21_04-gen2 latest"
                                             }
                                         }
                                         if (test_type == "AZURE_SGX") {

diff --git a/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos b/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos
@@ -99,7 +99,8 @@ CONFIG_HAVE_SCHED_AVG_IRQ=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -5527,4 +5528,3 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
 CONFIG_KALLSYMS_ALL=y
-CONFIG_TASK_IO_ACCOUNTING=y
diff --git a/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.10 b/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.10
@@ -112,7 +112,8 @@ CONFIG_HAVE_SCHED_AVG_IRQ=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_PSI is not set
 # end of CPU/Task time and stats accounting
 
@@ -6229,4 +6230,3 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
-CONFIG_TASK_IO_ACCOUNTING=y
diff --git a/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.10-1 b/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.10-1
@@ -114,7 +114,8 @@ CONFIG_HAVE_SCHED_AVG_IRQ=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_PSI is not set
 # end of CPU/Task time and stats accounting
 
@@ -6232,4 +6233,3 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
-CONFIG_TASK_IO_ACCOUNTING=y
diff --git a/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.4 b/scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.4
@@ -108,7 +108,8 @@ CONFIG_HAVE_SCHED_AVG_IRQ=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_PSI is not set
 # end of CPU/Task time and stats accounting
 
@@ -5994,4 +5995,3 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
 # end of Kernel hacking
-CONFIG_TASK_IO_ACCOUNTING=y