Updated upload/download artifact to v4 - Changed test reporting action

.github/workflows/universalnrp-test-run.yml

@@ -132,5 +132,5 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: success() || failure()
         with:
-          name: universal-nrp-test-${{ inputs.target }}-${{ inputs.install-osconfig == true && 'withOSConfig' || 'withoutOSConfig' }}-logs
+          name: universal-nrp-test-${{ inputs.target }}-${{ steps.normalize.outputs.policyPackage }}-${{ inputs.install-osconfig == true && 'withOSConfig' || 'withoutOSConfig' }}-logs
           path: osconfig-logs/osconfig*

.github/workflows/universalnrp-test.yml

@@ -29,17 +29,18 @@ jobs:
           ]
         policy-package:
           [
-            { path: LinuxSshServerSecurityBaselinePolicy.zip, skip-remediation: false, resource-count: 20 },
-            { path: LinuxSecurityBaselinePolicy.zip, skip-remediation: true, resource-count: 168 },
+            { path: LinuxSshServerSecurityBaselinePolicy.zip, resource-count: 20 },
+            { path: LinuxSecurityBaselinePolicy.zip, resource-count: 168 },
           ]
         arch: [amd64]
         install-osconfig: [false]
+        skip-remediation: [true, false]
     with:
       target: ${{ matrix.target.os }}-${{ matrix.target.version }}
       arch: ${{ matrix.arch }}
       package-type: ${{ matrix.target.package-type }}
       policy-package: ${{ matrix.policy-package.path }}
       resource-count: ${{ matrix.policy-package.resource-count }}
-      skip-remediation: ${{ matrix.policy-package.skip-remediation }}
+      skip-remediation: ${{ matrix.skip-remediation }}
       install-osconfig: ${{ matrix.install-osconfig }}
       tag: ${{ matrix.target.tag }}

src/tests/universal-nrp-e2e/UniversalNRP.Tests.ps1

@@ -11,9 +11,12 @@ param (
 )
 
 Describe 'Validate Universal NRP' {
-    # Perform monitoring - Get
-    Context "Get" {
+    # Perform Remediation - Set
+    Context "Set" -Skip:$SkipRemediation {
         BeforeAll {
+            Start-GuestConfigurationPackageRemediation -Path $PolicyPackage
+            # Wait for remediation to complete
+            Start-Sleep -Seconds 30
             $result = Get-GuestConfigurationPackageComplianceStatus -Path $PolicyPackage
         }
 
@@ -27,25 +30,26 @@ Describe 'Validate Universal NRP' {
                     $instance.complianceStatus | Should -BeTrue
                 }
                 elseif ($instance.properties.Reasons.Code -eq "FAIL") {
-                    $instance.complianceStatus | Should -BeFalse
+                    throw "There should not be any failing resources after remediation"
                 }
                 else {
                     throw "Reasons are not properly populated"
                 }
             }
         }
 
-        It 'Ensure all resource instances have status' {    
-            $result.resources.complianceStatus | Should -Not -BeNullOrEmpty
+        It 'Ensure all resource instances pass audit' {    
+            $result.resources.complianceStatus | Should -BeTrue
+        }
+
+        It 'Ensure overall audit pass' {
+            $result.complianceStatus | Should -BeTrue
         }
     }
 
-    # Perform Remediation - Set
-    Context "Set" -Skip:$SkipRemediation {
+    # Perform monitoring - Get
+    Context "Get" {
         BeforeAll {
-            Start-GuestConfigurationPackageRemediation -Path $PolicyPackage
-            # Wait for remediation to complete
-            Start-Sleep -Seconds 30
             $result = Get-GuestConfigurationPackageComplianceStatus -Path $PolicyPackage
         }
 
@@ -59,20 +63,16 @@ Describe 'Validate Universal NRP' {
                     $instance.complianceStatus | Should -BeTrue
                 }
                 elseif ($instance.properties.Reasons.Code -eq "FAIL") {
-                    throw "There should not be any failing resources after remediation"
+                    $instance.complianceStatus | Should -BeFalse
                 }
                 else {
                     throw "Reasons are not properly populated"
                 }
             }
         }
 
-        It 'Ensure all resource instances pass audit' {    
-            $result.resources.complianceStatus | Should -BeTrue
-        }
-
-        It 'Ensure overall audit pass' {
-            $result.complianceStatus | Should -BeTrue
+        It 'Ensure all resource instances have status' {    
+            $result.resources.complianceStatus | Should -Not -BeNullOrEmpty
         }
     }
 }