Upgrade Windows image to windows-2019. (#1879)

* Use windows-2019 since the latest version of windows image doesn't support Python 3.6. Signed-off-by: Jay Zhang <jiz@microsoft.com>
onnx · Mar 16, 2022 · ee75f4a · ee75f4a
1 parent d536f04
commit ee75f4a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/ci_build/azure_pipelines/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/keras2onnx_application_tests.yml
@@ -60,7 +60,7 @@ jobs:
 - job: 'Win'
   timeoutInMinutes: 180
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       Python36-onnx1.5:

diff --git a/ci_build/azure_pipelines/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/keras2onnx_unit_test.yml
@@ -76,7 +76,7 @@ jobs:
 
 - job: 'Win'
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       ############ TF Keras Unit Tests ############

diff --git a/ci_build/azure_pipelines/templates/job_generator.yml b/ci_build/azure_pipelines/templates/job_generator.yml
@@ -35,9 +35,9 @@ jobs:
                         ${{ if eq(platform, 'linux') }}:
                           CI_VM_IMAGE: 'ubuntu-latest'
                         ${{ if eq(platform, 'windows') }}:
-                          CI_VM_IMAGE: 'vs2017-win2016'
+                          CI_VM_IMAGE: 'windows-2019'
                         ${{ if eq(platform, 'mac') }}:
-                          CI_VM_IMAGE: 'macOS-10.13'
+                          CI_VM_IMAGE: 'macOS-11'
                         CI_PLATFORM: '${{ platform }}'
                         CI_PYTHON_VERSION: '${{ python_version }}'
                         CI_TF_VERSION: '${{ tf_version }}'

diff --git a/ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml
@@ -101,6 +101,7 @@ steps:
       pip install keras-self-attention
       pip install pytest pytest-cov pytest-runner
       pip install numpy==1.19
+      pip freeze --all
     displayName: 'Install dependencies'
 
   - script: |

diff --git a/ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml
@@ -32,6 +32,7 @@ steps:
       pip install pytest pytest-cov pytest-runner
       $(INSTALL_ORT)
       pip install numpy==1.19
+      pip freeze --all
     displayName: 'Install dependencies'
 
   - script: |

diff --git a/ci_build/azure_pipelines/templates/setup.yml b/ci_build/azure_pipelines/templates/setup.yml
@@ -62,8 +62,6 @@ steps:
       # onnx-weekly won't satisfy onnx requirement so uninstallation must happen here
       pip uninstall -y onnx
       pip install --index-url https://test.pypi.org/simple/ ${PIP_ONNX_NAME:-onnx}
-      pip uninstall -y typing-extensions
-      pip install typing-extensions>4.0.0
     fi
 
     pip freeze --all

diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml
@@ -44,7 +44,7 @@ jobs:
 
 - job: 'Win'
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       ############ TF Keras Unit Tests ############