Skip to content

Commit

Permalink
Fix yaml files
Browse files Browse the repository at this point in the history
We shouldn't need to make sure we're using a local copy of lib when
configuring the yaml file.

Signed-off-by: Dan Webb <[email protected]>
  • Loading branch information
damacus committed Apr 4, 2022
1 parent 66543a6 commit bb9f1c7
Show file tree
Hide file tree
Showing 7 changed files with 95 additions and 158 deletions.
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
13 changes: 0 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,3 @@ jobs:
ruby-version: '3.1'
bundler-cache: true
- run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}













66 changes: 0 additions & 66 deletions .kitchen.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
extends: default
rules:
line-length:
max: 256
level: warning
document-start: disable
braces:
forbid: false
min-spaces-inside: 0
max-spaces-inside: 1
min-spaces-inside-empty: -1
max-spaces-inside-empty: -1
31 changes: 14 additions & 17 deletions .kitchen.windows.yml → kitchen.windows.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<% # Make sure the local copy of the driver is loaded %>
<% lib = File.expand_path('../lib', __FILE__) %>
<% $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) %>
---
driver:
name: docker
provision_command:
provision_command:
- powershell -ExecutionPolicy Bypass -NoLogo -Command . { iwr -useb https://omnitruck.chef.io/install.ps1 } ^| iex; install
- powershell -Command $path=$env:Path + ';c:\opscode\chef\embedded\bin'; Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path

Expand All @@ -16,18 +13,18 @@ provisioner:
name: dummy

platforms:
- name: windows
driver_config:
image: mcr.microsoft.com/windows/servercore:1809
platform: windows
- name: windows
driver_config:
image: mcr.microsoft.com/windows/servercore:1809
platform: windows

suites:
- name: default
- name: context
driver:
build_context: false
- name: inspec
driver:
provision_command: echo 1
verifier:
name: inspec
- name: default
- name: context
driver:
build_context: false
- name: inspec
driver:
provision_command: echo 1
verifier:
name: inspec
63 changes: 63 additions & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
driver:
name: docker
provision_command: curl -L https://www.chef.io/chef/install.sh | bash

transport:
name: docker

provisioner:
name: dummy

platforms:
- name: amazonlinux-2
- name: ubuntu-18.04
- name: ubuntu-20.04
- name: fedora-latest
driver:
provision_command:
- yum install libxcrypt-compat -y
- curl -L https://www.chef.io/chef/install.sh | bash
- name: centos-7
- name: centos-8
- name: oraclelinux-7
- name: rockylinux-8
- name: debian-9
- name: debian-10
- name: opensuse-15
driver:
image: opensuse/leap:15
- name: dockerfile
driver:
username: dockerfile
password: dockerfile
dockerfile: test/Dockerfile
run_command: /sbin/init

suites:
- name: default
excludes: [arch]
- name: context
excludes: [arch]
driver:
build_context: false
- name: capabilities
includes: [debian-9, debian-10, ubuntu-18.04, ubuntu-20.04]
driver:
provision_command:
- curl -L https://www.chef.io/chef/install.sh | bash
- apt-get install -y net-tools
cap_drop:
- NET_ADMIN
- name: arm64
excludes: [debian-9]
driver:
docker_platform: linux/arm64
- name: amd64
driver:
docker_platform: linux/amd64
- name: inspec
driver:
provision_command: true
verifier:
name: inspec

0 comments on commit bb9f1c7

Please sign in to comment.