diff options
| author | Jaymala Sinha <jsinha@chef.io> | 2019-04-15 11:12:20 -0400 |
|---|---|---|
| committer | Jaymala Sinha <jsinha@chef.io> | 2019-04-15 11:12:20 -0400 |
| commit | e7beaae18bba01f75282ef4f51272ad42f95bf41 (patch) | |
| tree | 788663ae8e8fbb28dfe06af98fa67285cad5c239 | |
| parent | 80cf339fc0dad80011097fc982c211d350ffd0a3 (diff) | |
| download | chef-e7beaae18bba01f75282ef4f51272ad42f95bf41.tar.gz | |
Add kitchen-docker for bk tests
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 4 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 1 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.bk.yml | 42 |
3 files changed, 45 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index df167f7a18..5436eb8508 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -179,13 +179,13 @@ steps: commands: - /workdir/scripts/bk_tests/bk_install.sh - asdf local ruby 2.5.5 - - bundle install --jobs=3 --retry=3 --path=vendor/bundle - cd /workdir/kitchen-tests + - bundle install --jobs=3 --retry=3 --path=vendor/bundle - bundle exec kitchen test end-to-end-amazonlinux-2 expeditor: executor: docker: environment: - AMAZON=2 - - KITCHEN_YAML=kitchen.travis.yml + - KITCHEN_YAML=/workdir/kitchen-tests/kitchen.bk.yml - BUNDLE_GEMFILE=/workdir/kitchen-tests/Gemfile diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 6bd39ffe0e..da32a513ad 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -6,6 +6,7 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids f gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master" gem "kitchen-appbundle-updater" gem "kitchen-dokken", "=1.1.1" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787 +gem "kitchen-docker", git: "https://github.com/test-kitchen/kitchen-docker.git", branch: "master" gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master" gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master" gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master" diff --git a/kitchen-tests/kitchen.bk.yml b/kitchen-tests/kitchen.bk.yml new file mode 100644 index 0000000000..90f8da231c --- /dev/null +++ b/kitchen-tests/kitchen.bk.yml @@ -0,0 +1,42 @@ +--- +driver: + name: docker + customize: + cpus: 4 + memory: 2048 + use_internal_docker_network: true + + +verifier: + name: inspec + format: progress + +provisioner: + name: chef_github + chef_omnibus_url: "https://omnitruck.chef.io/install.sh" + chef_omnibus_install_options: "-c current" + github_owner: "chef" + github_repo: "chef" + ohai_refname: "master" + refname: <%= %x(git rev-parse HEAD) %> + client_rb: + diff_disabled: true + +platforms: + - name: amazonlinux + driver_config: + box: mvbcoding/awslinux + - name: amazonlinux-2 + - name: centos-6 + - name: centos-7 + - name: debian-8 + - name: debian-9 + - name: opensuse-leap-42 + - name: ubuntu-16.04 + - name: ubuntu-18.04 + +suites: + - name: end-to-end + run_list: + - recipe[end_to_end::default] + - recipe[end_to_end::tests] |