From 13b531c763334bb3ddf556c52f27d3982e0bbc26 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Wed, 13 Mar 2019 01:37:47 +0500
Subject: [PATCH] Azure Pipelines: refactoring, adding windows target

---
 .azure-pipelines.yml          | 21 ++++-----------------
 .ci/azure-pipelines-linux.yml | 21 +++++++++++++++++++++
 .ci/azure-pipelines-win.yml   | 15 +++++++++++++++
 3 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 .ci/azure-pipelines-linux.yml
 create mode 100644 .ci/azure-pipelines-win.yml

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 24fb53eb..27fa459e 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -1,19 +1,6 @@
-pool:
-  vmImage: 'Ubuntu 16.04'
-  
-variables:
-  CPACK_GENERATOR: DEB
+jobs:
+  - template: .ci/azure-pipelines-linux.yml
 
-steps:
-- checkout: self  
-  submodules: recursive
+#  - template: .ci/azure-pipelines-osx.yml
 
-- script: |
-    sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev
-    ./configure
-    make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4)
-    .ci/appveyor-deb-install-test.sh
-    sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps
-    sudo .ci/start-se-openvpn.sh
-    sudo .ci/run-openvpn-tests.sh
-  displayName: 'Ubuntu 16.04'
+  - template: .ci/azure-pipelines-win.yml
diff --git a/.ci/azure-pipelines-linux.yml b/.ci/azure-pipelines-linux.yml
new file mode 100644
index 00000000..430f71db
--- /dev/null
+++ b/.ci/azure-pipelines-linux.yml
@@ -0,0 +1,21 @@
+jobs:
+- job: linux_64
+  displayName: 'Ubuntu 16.04'
+  pool:
+    vmImage: ubuntu-16.04
+  variables:
+    CPACK_GENERATOR: DEB
+  strategy:
+    maxParallel: 8
+  steps:
+  - checkout: self  
+    submodules: recursive
+  - script: |
+      sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev
+      ./configure
+      make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4)
+      .ci/appveyor-deb-install-test.sh
+      sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip # openvpn build deps
+      sudo .ci/start-se-openvpn.sh
+      sudo .ci/run-openvpn-tests.sh
+    displayName: 'Ubuntu 16.04'
diff --git a/.ci/azure-pipelines-win.yml b/.ci/azure-pipelines-win.yml
new file mode 100644
index 00000000..0a1f6f40
--- /dev/null
+++ b/.ci/azure-pipelines-win.yml
@@ -0,0 +1,15 @@
+jobs:
+- job: win_64
+  displayName: 'Visual Studio 2017'
+  pool:
+    vmImage: vs2017-win2016
+  steps:
+  - checkout: self
+    submodules: recursive
+  - script: |
+     call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      configure
+  - script: |
+     call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      cd tmp
+      nmake