Merge pull request #8867 from chef/jsinha/appvyr_good

Migrate Appveyor windows testing to Buildkite

5 files changed, 81 insertions, 76 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index ef2ebb0b51..96b1e8e81d 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -2,6 +2,9 @@
 expeditor:
   defaults:
     buildkite:
+      retry:
+        automatic:
+          limit: 1
       timeout_in_minutes: 30
       retry:
         automatic:
@@ -189,6 +192,44 @@ steps:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
 
+- label: "Integration Specs Windows :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_win_integration.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        os_version: 2016
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Functional Specs Windows :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_win_functional.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        os_version: 2016
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Unit Specs Windows :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_win_unit.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
 - label: "Chefstyle :ruby: 2.6"
   commands:
     - /workdir/scripts/bk_tests/bk_container_prep.sh
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index b7be639c1b..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-version: "master-{build}"
-
-os: Visual Studio 2017
-platform:
-  - x64
-
-cache:
-  - vendor/bundle
-
-configuration:
-  - integration
-  - functional
-  - unit
-
-environment:
-  matrix:
-    - ruby_version: "25-x64"
-    - ruby_version: "26-x64"
-
-clone_folder: c:\projects\chef
-clone_depth: 1
-
-skip_commits:
-  # version bumps by Expeditor happen as a separate commit after the merge, we can skip
-  message: /Bump version to [0-9.]+ by Chef Expeditor/
-  # if ONLY the files listed below are changed in a commit, skip
-  files:
-    - CHANGELOG.md
-    - RELEASE_NOTES.md
-
-skip_tags: true
-branches:
-  only:
-    - master
-    - chef-14
-
-install:
-  - systeminfo
-  - winrm quickconfig -q
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
-  - set SSL_CERT_FILE=C:\cacert.pem
-  - bundle config --local path vendor/bundle # use the cache we define above
-  - bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
-  - SET SPEC_OPTS=--format progress
-  - SET CHEF_LICENSE="accept-no-persist"
-
-build: off
-
-before_test:
-  - ruby --version
-  - gem --version
-  - bundler --version
-  - bundle env
-
-for:
-  -
-    matrix:
-      only:
-        - configuration: integration
-    build_script:
-      - bundle exec rake spec:integration
-  -
-    matrix:
-      only:
-        - configuration: functional
-    build_script:
-      - bundle exec rake spec:functional
-  -
-    matrix:
-      only:
-        - configuration: unit
-    build_script:
-      - bundle exec rake spec:unit
-      - bundle exec rake component_specs
diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1
new file mode 100644
index 0000000000..06695ccd97
--- /dev/null
+++ b/scripts/bk_tests/bk_win_functional.ps1
@@ -0,0 +1,13 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:functional
+
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/scripts/bk_tests/bk_win_integration.ps1
new file mode 100644
index 0000000000..c6cdd5e2b1
--- /dev/null
+++ b/scripts/bk_tests/bk_win_integration.ps1
@@ -0,0 +1,13 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:integration
+
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_win_unit.ps1 b/scripts/bk_tests/bk_win_unit.ps1
new file mode 100644
index 0000000000..48ad3fe283
--- /dev/null
+++ b/scripts/bk_tests/bk_win_unit.ps1
@@ -0,0 +1,14 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:unit
+bundle exec rake component_specs
+
+exit $LASTEXITCODE
\ No newline at end of file