diff options
| author | Bryan McLellan <btm@chef.io> | 2020-05-13 17:35:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 17:35:38 -0400 |
| commit | 16de8feb348e0b27342a8b2b476a1d54439cd871 (patch) | |
| tree | 5ae1a8405d4a9361d1d448f7f83a38ad30426114 | |
| parent | 955fdfcf0e2ffe1a787d3e53dccbed5f0ffa71cc (diff) | |
| parent | 5863a0a80398783c56ae6bf12f335732c2dc0de7 (diff) | |
| download | chef-16de8feb348e0b27342a8b2b476a1d54439cd871.tar.gz | |
Merge pull request #9862 from chef/btm/win10-e2e-fixes
Switch end-to-end-windows-10 back to use the Linux scripts
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | .expeditor/verify_private.pipeline.yml | 8 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 1c982033c2..e76830b4b4 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -24,7 +24,7 @@ docker_images: - chef pipelines: - - verify/public: + - verify: definition: .expeditor/verify_public.pipeline.yml public: true - verify/private: diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml index 03d871bba9..5d62c77ae3 100644 --- a/.expeditor/verify_private.pipeline.yml +++ b/.expeditor/verify_private.pipeline.yml @@ -17,14 +17,18 @@ steps: - label: "Kitchen Tests Windows 10" commands: - - scripts/bk_tests/bk_win_prep.ps1 + - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - kitchen test end-to-end-windows-10 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-windows-10 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: KITCHEN_YAML: kitchen.azure.yml expeditor: + executor: + linux: + privileged: true + single-use: true secrets: AZURE_TENANT_ID: account: azure/engineering-dev-test diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index a06019944f..c70cf97f90 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -8,6 +8,7 @@ gem "kitchen-dokken", "~> 2.0" gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master" gem "inspec" gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master" +gem "kitchen-azurerm", git: "https://github.com/test-kitchen/kitchen-azurerm.git", branch: "master" # avoid Ruby 2.7 warnings -gem "docker-api", git: "https://github.com/chef/docker-api.git", branch: "master"
\ No newline at end of file +gem "docker-api", git: "https://github.com/chef/docker-api.git", branch: "master" |