Skip to content

Commit

Permalink
Merge branch 'HCK-CI:master' into add_alicloudoss_resultuploader
Browse files Browse the repository at this point in the history
  • Loading branch information
zjmletang authored Oct 8, 2024
2 parents 5770147 + 784b42d commit 28dd168
Show file tree
Hide file tree
Showing 32 changed files with 130 additions and 275 deletions.
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ GEM
sentry-ruby (5.17.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
sorbet (0.5.11558)
sorbet-static (= 0.5.11558)
sorbet-runtime (0.5.11558)
sorbet-static (0.5.11558-x86_64-linux)
sorbet-static-and-runtime (0.5.11558)
sorbet (= 0.5.11558)
sorbet-runtime (= 0.5.11558)
sorbet (0.5.11581)
sorbet-static (= 0.5.11581)
sorbet-runtime (0.5.11581)
sorbet-static (0.5.11581-x86_64-linux)
sorbet-static-and-runtime (0.5.11581)
sorbet (= 0.5.11581)
sorbet-runtime (= 0.5.11581)
spoom (1.4.2)
erubi (>= 1.10.0)
prism (>= 0.28.0)
Expand Down
7 changes: 4 additions & 3 deletions bin/ns
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ module AutoHCK
argv = parser.order(ARGV)

if workspace_path.nil?
Dir.chdir Config.read['workspace_path']
dirs = Dir['*/*/*/']
base = Config.read['workspace_path']
dirs = Dir['*/*/*/', base:]
abort 'no workspace found' if dirs.empty?

dirs.map! { File.absolute_path(base, workspace_path) }
workspace_path = dirs.max_by { File.mtime(_1) }
else
workspace_path = File.absolute_path(workspace_path, w)
workspace_path = File.absolute_path(workspace_path, chdir)
end

QemuHCK::Ns.enter workspace_path, chdir, *argv
Expand Down
1 change: 1 addition & 0 deletions lib/auxiliary/multi_logger.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# typed: true
# frozen_string_literal: true

# AutoHCK module
Expand Down
4 changes: 2 additions & 2 deletions lib/engines/hckinstall/kit.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"studio_platform": "Win2022x64"
},
"HLK11_24H2": {
"download_url": "https://go.microsoft.com/fwlink/?linkid=2271857",
"download_url": "https://go.microsoft.com/fwlink/?linkid=2289923",
"extra_software": [ "Test-NETHLK", "winfsp" ],
"studio_platform": "Win2022x64"
},
"HLK2025": {
"download_url": "https://go.microsoft.com/fwlink/?linkid=2271857",
"download_url": "https://go.microsoft.com/fwlink/?linkid=2289923",
"extra_software": [ "Test-NETHLK", "winfsp" ],
"studio_platform": "Win2022x64"
},
Expand Down
23 changes: 0 additions & 23 deletions lib/engines/hcktest/platforms/Win10_1903x64_q35.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
{
"name": "Win10_1903x64_q35_viommu",
"name": "Win10_1903x64_viommu",
"kit": "HLK1903",
"setupmanager": "qemuhck",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"device_extra": "",
"st_image": "HLK1903.qcow2",
"clients": {
"c1": {
"name": "CL1",
"cpus": 8,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
"image": "HLK1903-C1-Win10_1903x64.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 8,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
"image": "HLK1903-C2-Win10_1903x64.qcow2"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win11_22H2x64_host_uefi_q35_viommu",
"name": "Win11_22H2x64_host_uefi_viommu",
"kit": "HLK11_22H2",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK11_22H2-C1-Win11_22H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_22H2-C1-Win11_22H2x64-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK11_22H2-C2-Win11_22H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_22H2-C2-Win11_22H2x64-uefi-viommu.qcow2"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win11_23H2x64_host_uefi_q35_viommu",
"name": "Win11_23H2x64_host_uefi_viommu",
"kit": "HLK11_23H2",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK11_23H2-C1-Win11_23H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_23H2-C1-Win11_23H2x64-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK11_23H2-C2-Win11_23H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_23H2-C2-Win11_23H2x64-uefi-viommu.qcow2"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win11_24H2x64_host_uefi_q35_viommu",
"name": "Win11_24H2x64_host_uefi_viommu",
"kit": "HLK11_24H2",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK11_24H2-C1-Win11_24H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_24H2-C1-Win11_24H2x64-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK11_24H2-C2-Win11_24H2x64-uefi-q35-viommu.qcow2"
"image": "HLK11_24H2-C2-Win11_24H2x64-uefi-viommu.qcow2"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win11nextx64_host_uefi_q35_viommu",
"name": "Win11nextx64_host_uefi_viommu",
"kit": "HLK11_next",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK11_next-C1-Win11nextx64-uefi-q35-viommu.qcow2"
"image": "HLK11_next-C1-Win11nextx64-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK11_next-C2-Win11nextx64-uefi-q35-viommu.qcow2"
"image": "HLK11_next-C2-Win11nextx64-uefi-viommu.qcow2"
}
}
}
22 changes: 0 additions & 22 deletions lib/engines/hcktest/platforms/Win2008R2x64.json

This file was deleted.

22 changes: 0 additions & 22 deletions lib/engines/hcktest/platforms/Win2012R2x64.json

This file was deleted.

22 changes: 0 additions & 22 deletions lib/engines/hcktest/platforms/Win2012x64.json

This file was deleted.

1 change: 0 additions & 1 deletion lib/engines/hcktest/platforms/Win2016x64_uefi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"kit": "HLK1607",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"st_image": "HLK1607-uefi.qcow2",
"clients": {
"c1": {
Expand Down
1 change: 0 additions & 1 deletion lib/engines/hcktest/platforms/Win2019x64_uefi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"kit": "HLK1809server",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"st_image": "HLK1809-uefi.qcow2",
"clients": {
"c1": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win2022nextx64_host_uefi_q35_viommu",
"name": "Win2022nextx64_host_uefi_viommu",
"kit": "HLK2022_next",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK2022_next-C1-Win2022nextx64-host-uefi-q35-viommu.qcow2"
"image": "HLK2022_next-C1-Win2022nextx64-host-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK2022_next-C2-Win2022nextx64-host-uefi-q35-viommu.qcow2"
"image": "HLK2022_next-C2-Win2022nextx64-host-uefi-viommu.qcow2"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "Win2022x64_host_uefi_q35_viommu",
"name": "Win2022x64_host_uefi_viommu",
"kit": "HLK2022",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"viommu_state": true,
"enlightenments_state": true,
"cpu": "host",
Expand All @@ -14,14 +13,14 @@
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4002,
"image": "HLK2022-C1-Win2022x64-uefi-q35-viommu.qcow2"
"image": "HLK2022-C1-Win2022x64-uefi-viommu.qcow2"
},
"c2": {
"name": "CL2",
"cpus": 4,
"memory_gb": 8,
"winrm_port": 4003,
"image": "HLK2022-C2-Win2022x64-uefi-q35-viommu.qcow2"
"image": "HLK2022-C2-Win2022x64-uefi-viommu.qcow2"
}
}
}
1 change: 0 additions & 1 deletion lib/engines/hcktest/platforms/Win2022x64_uefi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"kit": "HLK2022",
"setupmanager": "qemuhck",
"fw_type": "uefi",
"machine_type": "q35",
"st_image": "HLK2022-uefi.qcow2",
"clients": {
"c1": {
Expand Down
Loading

0 comments on commit 28dd168

Please sign in to comment.