diff options
| author | Jeremiah Snapp <jeremiah@chef.io> | 2019-07-06 17:34:58 -0400 |
|---|---|---|
| committer | Jeremiah Snapp <jeremiah@chef.io> | 2019-07-06 17:40:57 -0400 |
| commit | 501a92c2f9fb2a0b76e6a63345e911dcd3c79ecf (patch) | |
| tree | 6556820bc9644cbf277dca3895522fda3ebcab47 | |
| parent | 85914b32f9010aacca472f93b13784825a67102f (diff) | |
| download | chef-snappj/enable-chocolatey-tests.tar.gz | |
Enable chocolatey testssnappj/enable-chocolatey-tests
Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>
| -rw-r--r-- | .expeditor/release.omnibus.yml | 89 | ||||
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 4 |
2 files changed, 47 insertions, 46 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 8c20a5c3aa..298384f557 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -3,54 +3,55 @@ project-name: chef config: omnibus/omnibus.rb test-path: omnibus/omnibus-test.sh test-path-windows: omnibus/omnibus-test.ps1 +test-channel: stable fips-platforms: - el-*-x86_64 - windows-* builder-to-testers-map: - aix-7.1-powerpc: - - aix-7.1-powerpc - debian-8-x86_64: - - debian-8-x86_64 - - debian-9-x86_64 - el-6-i386: - - el-6-i386 - el-6-s390x: - - el-6-s390x - el-6-x86_64: - - el-6-x86_64 - el-7-aarch64: - - el-7-aarch64 - el-7-ppc64: - - el-7-ppc64 - el-7-ppc64le: - - el-7-ppc64le - el-7-s390x: - - el-7-s390x - el-7-x86_64: - - el-7-x86_64 - freebsd-10-x86_64: - - freebsd-10-x86_64 - - freebsd-11-x86_64 - mac_os_x-10.12-x86_64: - - mac_os_x-10.12-x86_64 - - mac_os_x-10.13-x86_64 - - mac_os_x-10.14-x86_64 - sles-11-s390x: - - sles-11-s390x - sles-11-x86_64: - - sles-11-x86_64 - sles-12-s390x: - - sles-12-s390x - sles-12-x86_64: - - sles-12-x86_64 - - sles-15-x86_64 - solaris-11-i86pc: - - solaris-11-i86pc - solaris-11-sparc: - - solaris-11-sparc - ubuntu-16.04-x86_64: - - ubuntu-16.04-x86_64 - - ubuntu-18.04-x86_64 + # aix-7.1-powerpc: + # - aix-7.1-powerpc + # debian-8-x86_64: + # - debian-8-x86_64 + # - debian-9-x86_64 + # el-6-i386: + # - el-6-i386 + # el-6-s390x: + # - el-6-s390x + # el-6-x86_64: + # - el-6-x86_64 + # el-7-aarch64: + # - el-7-aarch64 + # el-7-ppc64: + # - el-7-ppc64 + # el-7-ppc64le: + # - el-7-ppc64le + # el-7-s390x: + # - el-7-s390x + # el-7-x86_64: + # - el-7-x86_64 + # freebsd-10-x86_64: + # - freebsd-10-x86_64 + # - freebsd-11-x86_64 + # mac_os_x-10.12-x86_64: + # - mac_os_x-10.12-x86_64 + # - mac_os_x-10.13-x86_64 + # - mac_os_x-10.14-x86_64 + # sles-11-s390x: + # - sles-11-s390x + # sles-11-x86_64: + # - sles-11-x86_64 + # sles-12-s390x: + # - sles-12-s390x + # sles-12-x86_64: + # - sles-12-x86_64 + # - sles-15-x86_64 + # solaris-11-i86pc: + # - solaris-11-i86pc + # solaris-11-sparc: + # - solaris-11-sparc + # ubuntu-16.04-x86_64: + # - ubuntu-16.04-x86_64 + # - ubuntu-18.04-x86_64 windows-2012r2-i386: - windows-2012r2-i386 windows-2012r2-x86_64: diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index b6f054370c..cde0a3904c 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -82,8 +82,8 @@ Get-Location # ffi-yajl must run in c-extension mode for perf, so force it so we don't accidentally fall back to ffi $Env:FORCE_FFI_YAJL = "ext" -# chocolatey functional tests fail so delete the chocolatey binary to avoid triggering them -Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyContinue +# # chocolatey functional tests fail so delete the chocolatey binary to avoid triggering them +# Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyContinue # some tests need winrm configured winrm quickconfig -quiet |