summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-08-17 15:24:12 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2020-08-17 15:24:12 -0700
commitf3a9032ba57d2a454995a1f37634916537532ad3 (patch)
treeee2d1e4219e7dd0e6576df634a0068617a129902
parent963d8fa28a953db1eece95390e2c9606274ed815 (diff)
downloadchef-f3a9032ba57d2a454995a1f37634916537532ad3.tar.gz
Reenable disabled windows tests in the omnibus pipelinelcg/reenable-windows-failures
- reenables the choco tests - reenables the win2012r2-32bit tests - reenables the powershell package tests on win2012 Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--.expeditor/release.omnibus.yml4
-rw-r--r--omnibus/omnibus-test.ps12
-rw-r--r--spec/unit/provider/package/powershell_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index e261b0c48a..a429ee4703 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -54,8 +54,8 @@ builder-to-testers-map:
- ubuntu-16.04-x86_64
- ubuntu-18.04-x86_64
- ubuntu-20.04-x86_64
-# windows-2012r2-i386:
-# - windows-2012r2-i386
+ windows-2012r2-i386:
+ - windows-2012r2-i386
windows-2012r2-x86_64:
- windows-2012-x86_64
- windows-2012r2-x86_64
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1
index 999f590495..73e3b5338f 100644
--- a/omnibus/omnibus-test.ps1
+++ b/omnibus/omnibus-test.ps1
@@ -94,5 +94,5 @@ winrm quickconfig -quiet
bundle
If ($lastexitcode -ne 0) { Exit $lastexitcode }
-bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f progress --tag ~choco_installed
+bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f progress
If ($lastexitcode -ne 0) { Exit $lastexitcode }
diff --git a/spec/unit/provider/package/powershell_spec.rb b/spec/unit/provider/package/powershell_spec.rb
index 256901c928..482b19c218 100644
--- a/spec/unit/provider/package/powershell_spec.rb
+++ b/spec/unit/provider/package/powershell_spec.rb
@@ -19,7 +19,7 @@
require "spec_helper"
require "chef/mixin/powershell_out"
-describe Chef::Provider::Package::Powershell, :windows_only, :windows_gte_10 do
+describe Chef::Provider::Package::Powershell, :windows_only do
include Chef::Mixin::PowershellOut
let(:timeout) { 900 }
let(:source) { nil }