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

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

@@ -5,25 +5,36 @@ on:
     inputs:
       target:
         required: true
+        description: 'The target OS to use in build / test run.'
         type: string
       arch:
         required: true
+        description: 'The architecture to use in build / test run.'
         type: string
       package-type:
         required: true
+        description: 'The package type to use in the test run (DEB | RPM).'
         type: string
       policy-package:
         required: true
+        description: 'Path to the policy package to use in the test run.'
+        type: string
+      policy-package-short-name:
+        required: true
+        description: 'Short name of the policy package to use in the test result artifact name.'
         type: string
       resource-count:
         required: true
+        description: 'The number of resources in the policy package.'
         type: string
       install-osconfig:
         required: false
+        description: 'Whether to install OSConfig package or not.'
         type: boolean
         default: false
       skip-remediation:
         required: false
+        description: 'Whether to skip remediation or not.'
         type: boolean
         default: false
       tag:
@@ -132,5 +143,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 }}-${{ inputs.policy-package-short-name }}-${{ inputs.skip-remediation == true && 'Get' || 'Set' }}${{ inputs.install-osconfig == true && '-package' || '' }}-logs
           path: osconfig-logs/osconfig*

.github/workflows/universalnrp-test.yml

@@ -29,17 +29,19 @@ jobs:
           ]
         policy-package:
           [
-            { path: LinuxSshServerSecurityBaselinePolicy.zip, skip-remediation: false, resource-count: 20 },
-            { path: LinuxSecurityBaselinePolicy.zip, skip-remediation: true, resource-count: 168 },
+            { path: LinuxSshServerSecurityBaselinePolicy.zip, short-name: SSH, resource-count: 20 },
+            { path: LinuxSecurityBaselinePolicy.zip, short-name: ASB, 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 }}
+      policy-package-short-name: ${{ matrix.policy-package.short-name }}
       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,6 +11,15 @@ param (
 )
 
 Describe 'Validate Universal NRP' {
+    # Perform Remediation - Set
+    Context "Set" -Skip:$SkipRemediation {
+        It 'Perform remediation' {    
+            Start-GuestConfigurationPackageRemediation -Path $PolicyPackage
+            # Wait for remediation to complete
+            Start-Sleep -Seconds 30
+        }
+    }
+
     # Perform monitoring - Get
     Context "Get" {
         BeforeAll {
@@ -39,40 +48,4 @@ Describe 'Validate Universal NRP' {
             $result.resources.complianceStatus | Should -Not -BeNullOrEmpty
         }
     }
-
-    # 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
-        }
-
-        It 'Ensure the total resource instances count' {    
-            $result.resources | Should -HaveCount $ResourceCount
-        }
-
-        It 'Ensure resons are properly populated' {
-            foreach ($instance in $result.resources) {
-                if ($instance.properties.Reasons.Code -eq "PASS") {
-                    $instance.complianceStatus | Should -BeTrue
-                }
-                elseif ($instance.properties.Reasons.Code -eq "FAIL") {
-                    throw "There should not be any failing resources after remediation"
-                }
-                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
-        }
-    }
 }