gsadmin/PSProxmoxVE
1
0
Fork 0
mirror of https://github.com/GoodOlClint/PSProxmoxVE.git synced 2026-07-26 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): align all projects on net9.0, upgrade actions to v5, enable VM tests

Browse Source 
- Change test projects from net10.0 to net9.0 to match source projects
- Update build workflow from net8.0 to net9.0
- Upgrade checkout to v5, setup-dotnet to v5 across all workflows
- Remove outdated PS 7.2 test matrix entries
- Restructure integration tests: create test keeps VM alive so start/stop,
  snapshot, and cloud-init tests can use it instead of skipping. AfterAll
  handles cleanup.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Clint Branham
2026-03-18 16:59:43 -05:00
parent 8779dc5818
commit b64c34c8cd
7 changed files with 53 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+12 -12
View File
@@ -10,11 +10,11 @@ jobs:
build-net48:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'
- name: Restore dependencies
run: dotnet restore
- name: Build net48
@@ -27,25 +27,25 @@ jobs:
name: coverage-net48
path: ./coverage
build-net8:
build-net9:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'
- name: Restore dependencies
run: dotnet restore
- name: Build net8.0
run: dotnet build --configuration Release --framework net8.0 --no-restore
- name: Test net8.0
run: dotnet test tests/PSProxmoxVE.Core.Tests/PSProxmoxVE.Core.Tests.csproj --configuration Release --framework net8.0 --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
- name: Build net9.0
run: dotnet build --configuration Release --framework net9.0 --no-restore
- name: Test net9.0
run: dotnet test tests/PSProxmoxVE.Core.Tests/PSProxmoxVE.Core.Tests.csproj --configuration Release --framework net9.0 --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
- name: Upload coverage
uses: actions/upload-artifact@v4
with:
name: coverage-net8-${{ matrix.os }}
name: coverage-net9-${{ matrix.os }}
path: ./coverage
.github/workflows/integration-tests.yml
+2 -2
View File
@@ -48,7 +48,7 @@ jobs:
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# ── Pre-flight cleanup ─────────────────────────────────────────────
@@ -217,7 +217,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: integration-test-results
path: TestResults/
.github/workflows/mock-integration-tests.yml
+8 -8
View File
@@ -18,27 +18,27 @@ jobs:
matrix:
include:
- os: ubuntu-latest
framework: net10.0
framework: net9.0
shell: pwsh
- os: windows-latest
framework: net10.0
framework: net9.0
shell: pwsh
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'
dotnet-version: '9.0.x'
- name: Build mock server
run: dotnet build tests/PSProxmoxVE.MockServer/PSProxmoxVE.MockServer.csproj --configuration Release
- name: Build module
run: dotnet publish src/PSProxmoxVE/PSProxmoxVE.csproj --configuration Release --framework net10.0 --output ./publish/net10.0
run: dotnet publish src/PSProxmoxVE/PSProxmoxVE.csproj --configuration Release --framework net9.0 --output ./publish/net9.0
- name: Install Pester 5
shell: pwsh
@@ -50,7 +50,7 @@ jobs:
run: |
$modulePath = "$env:USERPROFILE\Documents\PowerShell\Modules\PSProxmoxVE"
New-Item -ItemType Directory -Path $modulePath -Force | Out-Null
Copy-Item -Path .\publish\net10.0\* -Destination $modulePath -Recurse -Force
Copy-Item -Path .\publish\net9.0\* -Destination $modulePath -Recurse -Force
- name: Copy module to module path (Linux)
if: matrix.os != 'windows-latest'
@@ -58,7 +58,7 @@ jobs:
run: |
$modulePath = "$HOME/.local/share/powershell/Modules/PSProxmoxVE"
New-Item -ItemType Directory -Path $modulePath -Force | Out-Null
Copy-Item -Path ./publish/net10.0/* -Destination $modulePath -Recurse -Force
Copy-Item -Path ./publish/net9.0/* -Destination $modulePath -Recurse -Force
- name: Run mock integration tests
shell: pwsh
.github/workflows/unit-tests.yml
+6 -28
View File
@@ -16,50 +16,28 @@ jobs:
ps_version: '5.1'
framework: net48
shell: powershell
- os: windows-latest
ps_version: '7.2'
framework: net8.0
shell: pwsh
- os: windows-latest
ps_version: '7.5'
framework: net8.0
shell: pwsh
- os: ubuntu-latest
ps_version: '7.2'
framework: net8.0
framework: net9.0
shell: pwsh
- os: ubuntu-latest
ps_version: '7.5'
framework: net8.0
framework: net9.0
shell: pwsh
- os: macos-latest
ps_version: '7.5'
framework: net8.0
framework: net9.0
shell: pwsh
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
- name: Install PowerShell 7.2 (Windows)
if: matrix.ps_version == '7.2' && matrix.os == 'windows-latest'
shell: pwsh
run: |
winget install --id Microsoft.PowerShell --version 7.2 --accept-source-agreements --accept-package-agreements --silent
continue-on-error: true
- name: Install PowerShell 7.2 (Linux)
if: matrix.ps_version == '7.2' && matrix.os == 'ubuntu-latest'
run: |
wget -q https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/powershell_7.2.24-1.deb_amd64.deb
sudo dpkg -i powershell_7.2.24-1.deb_amd64.deb
sudo apt-get install -f -y
dotnet-version: '9.0.x'
- name: Build module
run: dotnet publish src/PSProxmoxVE/PSProxmoxVE.csproj --configuration Release --framework ${{ matrix.framework }} --output ./publish/${{ matrix.framework }}
tests/PSProxmoxVE.Core.Tests/PSProxmoxVE.Core.Tests.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net48</TargetFrameworks>
<TargetFrameworks>net9.0;net48</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
tests/PSProxmoxVE.MockServer/PSProxmoxVE.MockServer.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
tests/PSProxmoxVE.Tests/Integration/Integration.Tests.ps1
+23 -33
View File
@@ -77,7 +77,7 @@ BeforeAll {
# Track resources created during the run so AfterAll can clean up.
$script:CreatedVmIds = [System.Collections.Generic.List[int]]::new()
$script:CreatedVmSnaps = [System.Collections.Generic.List[hashtable]]::new()
$script:TestVmId = $null
}
AfterAll {
@@ -85,6 +85,8 @@ AfterAll {
if ($null -eq $script:SkipReason -and $script:CreatedVmIds.Count -gt 0) {
foreach ($vmId in $script:CreatedVmIds) {
try {
Stop-PveVm -Node $script:Node -VmId $vmId -ErrorAction SilentlyContinue | Out-Null
Start-Sleep -Seconds 3
Remove-PveVm -Node $script:Node -VmId $vmId -Force -Purge -Confirm:$false -ErrorAction SilentlyContinue
}
catch { <# non-fatal #> }
@@ -153,7 +155,7 @@ Describe 'Integration Tests' -Tag 'Integration' {
{ Get-PveVm -Node $script:Node -ErrorAction Stop } | Should -Not -Throw
}
It 'Should create and remove a test VM' {
It 'Should create a test VM' {
if ($script:SkipReason) { Set-ItResult -Skipped -Because $script:SkipReason; return }
$task = New-PveVm `
@@ -170,34 +172,22 @@ Describe 'Integration Tests' -Tag 'Integration' {
Select-Object -First 1
$vm | Should -Not -BeNullOrEmpty
$script:TestVmId = $vm.VmId
$script:CreatedVmIds.Add($vm.VmId)
$removeTask = Remove-PveVm `
-Node $script:Node `
-VmId $vm.VmId `
-Confirm:$false `
-Wait
$removeTask | Should -Not -BeNullOrEmpty
$script:CreatedVmIds.Remove($vm.VmId) | Out-Null
}
It 'Should start and stop a VM' {
if ($script:SkipReason) { Set-ItResult -Skipped -Because $script:SkipReason; return }
# Requires at least one VM on the test node; skip if none found.
$vm = Get-PveVm -Node $script:Node | Where-Object { $_.Status -eq 'stopped' } |
Select-Object -First 1
if ($null -eq $vm) {
Set-ItResult -Skipped -Because 'No stopped VM available on the test node'
if ($null -eq $script:TestVmId) {
Set-ItResult -Skipped -Because 'No test VM was created'
return
}
$startTask = Start-PveVm -Node $script:Node -VmId $vm.VmId -Wait
$startTask = Start-PveVm -Node $script:Node -VmId $script:TestVmId -Wait
$startTask | Should -Not -BeNullOrEmpty
$stopTask = Stop-PveVm -Node $script:Node -VmId $vm.VmId -Wait
$stopTask = Stop-PveVm -Node $script:Node -VmId $script:TestVmId -Wait
$stopTask | Should -Not -BeNullOrEmpty
}
@@ -260,31 +250,34 @@ Describe 'Integration Tests' -Tag 'Integration' {
It 'Should create and remove a snapshot' {
if ($script:SkipReason) { Set-ItResult -Skipped -Because $script:SkipReason; return }
$vm = Get-PveVm -Node $script:Node | Where-Object { $_.Status -eq 'stopped' } |
Select-Object -First 1
if ($null -eq $vm) {
Set-ItResult -Skipped -Because 'No stopped VM available for snapshot test'
if ($null -eq $script:TestVmId) {
Set-ItResult -Skipped -Because 'No test VM was created'
return
}
# Ensure the VM is stopped for snapshot
$vm = Get-PveVm -Node $script:Node | Where-Object { $_.VmId -eq $script:TestVmId }
if ($vm.Status -eq 'running') {
Stop-PveVm -Node $script:Node -VmId $script:TestVmId -Wait | Out-Null
}
$snapName = 'pester-snap'
$createTask = New-PveSnapshot `
-Node $script:Node `
-VmId $vm.VmId `
-VmId $script:TestVmId `
-Name $snapName `
-Description 'Created by Pester integration test' `
-Wait
$createTask | Should -Not -BeNullOrEmpty
$snapshots = Get-PveSnapshot -Node $script:Node -VmId $vm.VmId
$snapshots = Get-PveSnapshot -Node $script:Node -VmId $script:TestVmId
$snapshots | Where-Object { $_.Name -eq $snapName } | Should -Not -BeNullOrEmpty
$removeTask = Remove-PveSnapshot `
-Node $script:Node `
-VmId $vm.VmId `
-VmId $script:TestVmId `
-Name $snapName `
-Confirm:$false `
-Wait
@@ -330,16 +323,13 @@ Describe 'Integration Tests' -Tag 'Integration' {
It 'Should get cloud-init config' {
if ($script:SkipReason) { Set-ItResult -Skipped -Because $script:SkipReason; return }
$ciVm = Get-PveVm -Node $script:Node | Where-Object { $_.Status -eq 'stopped' } |
Select-Object -First 1
if ($null -eq $ciVm) {
Set-ItResult -Skipped -Because 'No stopped VM available for cloud-init test'
if ($null -eq $script:TestVmId) {
Set-ItResult -Skipped -Because 'No test VM available for cloud-init test'
return
}
# Get-PveCloudInitConfig should not throw even if the VM has no cloud-init drive.
{ Get-PveCloudInitConfig -Node $script:Node -VmId $ciVm.VmId -ErrorAction Stop } |
{ Get-PveCloudInitConfig -Node $script:Node -VmId $script:TestVmId -ErrorAction Stop } |
Should -Not -Throw
}
}