Forráskód Böngészése

Merge pull request #39830 from thaJeztah/fix_rs1_NdisAdapters_leak

windows.ps1: fix leaked NdisAdapters not being cleaned up on RS1
Kirill Kolyshkin 5 éve
szülő
commit
b608ae379a
1 módosított fájl, 4 hozzáadás és 12 törlés
  1. 4 12
      hack/ci/windows.ps1

+ 4 - 12
hack/ci/windows.ps1

@@ -203,12 +203,8 @@ Function Nuke-Everything {
         $count=(Get-ChildItem $reg | Measure-Object).Count
         $count=(Get-ChildItem $reg | Measure-Object).Count
         if ($count -gt 0) {
         if ($count -gt 0) {
             Write-Warning "There are $count NdisAdapters leaked under Psched\Parameters"
             Write-Warning "There are $count NdisAdapters leaked under Psched\Parameters"
-            if ($env:COMPUTERNAME -match "jenkins-rs1-") {
-                Write-Warning "Cleaning Psched..."
-                Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
-            } else {
-                Write-Warning "Not cleaning as not a production RS1 server"
-            }
+            Write-Warning "Cleaning Psched..."
+            Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
         }
         }
 
 
         # TODO: This should be able to be removed in August 2017 update. Only needed for RS1
         # TODO: This should be able to be removed in August 2017 update. Only needed for RS1
@@ -216,12 +212,8 @@ Function Nuke-Everything {
         $count=(Get-ChildItem $reg | Measure-Object).Count
         $count=(Get-ChildItem $reg | Measure-Object).Count
         if ($count -gt 0) {
         if ($count -gt 0) {
             Write-Warning "There are $count NdisAdapters leaked under WFPLWFS\Parameters"
             Write-Warning "There are $count NdisAdapters leaked under WFPLWFS\Parameters"
-            if ($env:COMPUTERNAME -match "jenkins-rs1-") {
-                Write-Warning "Cleaning WFPLWFS..."
-                Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
-            } else {
-                Write-Warning "Not cleaning as not a production RS1 server"
-            }
+            Write-Warning "Cleaning WFPLWFS..."
+            Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
         }
         }
     } catch {
     } catch {
         # Don't throw any errors onwards Throw $_
         # Don't throw any errors onwards Throw $_