1. docker
  2. Commit 70ca64d736f8854bb72436a9eba768eabbe9af69
Browse code

windows.ps1: fix leaked NdisAdapters not being cleaned up on RS1

Windows RS1 has problems with leaking NdisAdapters during the integration
tests; the windows.ps1 script has a cleanup stesp to remove those
leaked adapters.

For internal testing at Microsoft on internal builds, this cleanup step
was skipped, and only ran on the CI machines in our Jenkins.

Due to the move to our new Jenkins, the names of Windows machines changed,
and because of that, the cleanup step was never executed, resulting in the
leaked adapters not being cleaned up:

```
20:32:23 WARNING: There are 608 NdisAdapters leaked under Psched\Parameters
20:32:23 WARNING: Not cleaning as not a production RS1 server
20:32:24 WARNING: There are 608 NdisAdapters leaked under WFPLWFS\Parameters
20:32:24 WARNING: Not cleaning as not a production RS1 server
```

```
22:01:31 WARNING: There are 1209 NdisAdapters leaked under Psched\Parameters
22:01:31 WARNING: Not cleaning as not a production RS1 server
22:01:31 WARNING: There are 1209 NdisAdapters leaked under WFPLWFS\Parameters
22:01:31 WARNING: Not cleaning as not a production RS1 server
```

This patch removes the check for non-production builds, and unconditionally
cleans up leaked adapters if they are found.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 156ad54fb707ed8b03a1084a841ef5602198799a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/30 06:41:45
Showing 1 changed files
hack/ci/windows.ps1
History View file @ 70ca64d
... ... 
@@ -203,12 +203,8 @@ Function Nuke-Everything {
203 203 
         $count=(Get-ChildItem $reg | Measure-Object).Count
204 204 
         if ($count -gt 0) {
205 205 
             Write-Warning "There are $count NdisAdapters leaked under Psched\Parameters"
206 
-            if ($env:COMPUTERNAME -match "jenkins-rs1-") {
207 
-                Write-Warning "Cleaning Psched..."
208 
-                Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
209 
-            } else {
210 
-                Write-Warning "Not cleaning as not a production RS1 server"
211 
-            }
206 
+            Write-Warning "Cleaning Psched..."
207 
+            Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
212 208 
         }
213 209
214 210 
         # TODO: This should be able to be removed in August 2017 update. Only needed for RS1
... ... 
@@ -216,12 +212,8 @@ Function Nuke-Everything {
216 216 
         $count=(Get-ChildItem $reg | Measure-Object).Count
217 217 
         if ($count -gt 0) {
218 218 
             Write-Warning "There are $count NdisAdapters leaked under WFPLWFS\Parameters"
219 
-            if ($env:COMPUTERNAME -match "jenkins-rs1-") {
220 
-                Write-Warning "Cleaning WFPLWFS..."
221 
-                Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
222 
-            } else {
223 
-                Write-Warning "Not cleaning as not a production RS1 server"
224 
-            }
219 
+            Write-Warning "Cleaning WFPLWFS..."
220 
+            Get-ChildItem $reg | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
225 221 
         }
226 222 
     } catch {
227 223 
         # Don't throw any errors onwards Throw $_