Skip to content

Commit

Permalink
Fixed CI tests for both platforms
Browse files Browse the repository at this point in the history
Signed-off-by: Jeffrey Coe <[email protected]>
  • Loading branch information
jeffreycoe committed Jun 25, 2020
1 parent 08e4818 commit 45483cf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .kitchen.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provisioner:
platforms:
- name: windows
driver_config:
image: mcr.microsoft.com/windows/servercore:1803
image: mcr.microsoft.com/windows/servercore:1809
platform: windows

suites:
Expand Down
13 changes: 5 additions & 8 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ platforms:
- name: oraclelinux-7
- name: debian-8
- name: debian-9
- name: opensuse-42.3
driver:
image: opensuse/leap:42.3
- name: opensuse/leap-42
# - name: arch
# driver:
# image: base/archlinux
# provision_command: true
# Removing opensuse CI tests temporarily due to an issue with the Chef install script not providing
# the correct platform name for opensuse resulting in consistent failures for this platform
#- name: opensuse-42.3
# driver:
# image: opensuse/leap:42.3
- name: unknown
driver:
image: ubuntu:16.04
Expand Down
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,20 @@ matrix:
- os: windows
language: bash
install:
- choco uninstall ruby
- choco install ruby --version=2.6.5.1
- export PATH=$(echo "$PATH" | sed -e 's/:\/c\/tools\/ruby27\/bin//')
- export PATH=$PATH:/c/tools/ruby26/bin
- choco install mingw
- choco install msys2
- ridk.cmd exec pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain
- ridk.cmd exec pacman -S --noconfirm --needed base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-libxslt
script:
- taskkill -IM "gpg-agent.exe" -F
- if [[ $(tasklist | grep "gpg-agent") ]]; then taskkill -IM "gpg-agent.exe" -F; else echo "Process gpg-agent not found. Skipping."; fi
- powershell -ExecutionPolicy Bypass -NoLogo -File docker.ps1
- export KITCHEN_YAML=.kitchen.windows.yml
- ruby -v
- gem install bundler
- bundle config build.nokogiri --use-system-libraries
- bundle install
- bundle exec docker version
- bundle exec kitchen --version
Expand Down

0 comments on commit 45483cf

Please sign in to comment.