[Windows] Resolve OVS dependency for VC 2010 runtime (#1099)

The latest OVS pacakge provided by Antrea depends on VC 2010 and VC 2013 runtime. However the OVS package only contains VC 2013. Which will cause customer need to install VC 2010 before install or run OVS. So we update the OVS package to: - Remove dependency for VC 2013. - Add VC 2010 redistribution which will be installed during the OVS installation progress. This patch updates the OVS package information. Signed-off-by: Rui Cao <[email protected]>
antrea-io · Aug 19, 2020 · 9aeea97 · 9aeea97
1 parent c2d7280
commit 9aeea97
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,6 +41,16 @@ jobs:
         echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         docker push antrea/antrea-windows:latest
       shell: bash
+  test-windows-ovs-installation:
+    runs-on: [windows-2019]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Test OVS Windows installation.
+      run: hack/windows/Install-OVS.ps1
+      shell: powershell
+    - name: Check VC runtime
+      run: ls c:\Windows\system32\ | findstr -i MSVCR
+      shell: powershell
 
   build-octant-antrea-ubuntu:
     runs-on: [ubuntu-18.04]

diff --git a/hack/windows/Install-OVS.ps1 b/hack/windows/Install-OVS.ps1
@@ -8,8 +8,8 @@ $ErrorActionPreference = "Stop"
 # TODO: set up HTTPS so that the archive can be downloaded securely. In the
 # meantime, we use a SHA256 hash to ensure that the downloaded archive is
 # correct.
-$OVSDownloadURL = "http://downloads.antrea.io/ovs/ovs-2.13.1-win64.zip"
-$OVSPublishedHash = '7E8364D684CC37417D70281354AA55987F52F143BF2DA162B6728A24E6B67546'
+$OVSDownloadURL = "http://downloads.antrea.io/ovs/ovs-2.13.1-antrea.1-win64.zip"
+$OVSPublishedHash = '83AA08526D947B08A952339B849441D4896AAB7437B4101CFBCE1130888FF459'
 $OVSDownloadDir = [System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition)
 $InstallLog = "$OVSDownloadDir\install.log"
 $OVSZip = "$OVSDownloadDir\ovs-win64.zip"
@@ -111,6 +111,10 @@ function InstallOVS() {
     Start-Process -FilePath $OVSInstallDir/redist/vcredist_x64.exe -Args '/install /passive /norestart' -Verb RunAs -Wait
     # Install OVS kernel driver.
     Log "Installing OVS kernel driver"
+    LOG "Driver path: $OVSDriverDir"
+    ls $OVSDriverDir
+    cd $OVSDriverDir
+    ./install.cmd
     cmd /c "cd $OVSDriverDir && install.cmd"
     if (!$?) {
         Log "Install OVS kernel driver failed, exit"