Skip to content

Commit 6655a8f

Browse files
committed
ci: switch integration to exec on ubuntu
- Add kitchen.exec.yml profile using exec driver/transport for localhost - Update integration workflow to run with KITCHEN_LOCAL_YAML=kitchen.exec.yml - Run verify against localhost with the exec profile - Remove dokken-specific DOCKER_HOST and socat setup from CI - Delete kitchen.dokken.yml now that CI no longer uses dokken Signed-off-by: Lance Albertson <lance@osuosl.org>
1 parent ec1039f commit 6655a8f

3 files changed

Lines changed: 34 additions & 36 deletions

File tree

.github/workflows/integration.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ env:
1313
SPEC_OPTS: --format progress
1414

1515
jobs:
16-
dokken:
16+
exec:
1717
env:
18-
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
19-
DOCKER_HOST: tcp://localhost:2375
18+
KITCHEN_LOCAL_YAML: kitchen.exec.yml
2019
runs-on: ubuntu-latest
2120
strategy:
2221
fail-fast: false
@@ -32,13 +31,8 @@ jobs:
3231
run: |
3332
bundle config set --local with 'integration'
3433
bundle install
35-
- name: Expose Docker over TCP for dokken
36-
run: |
37-
sudo apt-get install -y socat
38-
sudo socat TCP4-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock &
39-
sleep 1
40-
- name: Verify Dokken
41-
run: bundle exec kitchen verify
34+
- name: Verify Exec (Ubuntu)
35+
run: bundle exec kitchen verify localhost
4236
- name: Capture kitchen.log on failure
4337
if: failure()
4438
run: |
@@ -57,7 +51,7 @@ jobs:
5751
- name: Show generated client.rb on failure
5852
if: failure()
5953
run: |
60-
find /home/runner/.dokken/kitchen_sandbox -name "client.rb" -o -name "solo.rb" 2>/dev/null | while read f; do
54+
find .kitchen /tmp -name "client.rb" -o -name "solo.rb" 2>/dev/null | while read f; do
6155
echo "=== $f ==="
6256
cat "$f"
6357
done || true

kitchen.dokken.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

kitchen.exec.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
driver:
3+
name: exec
4+
5+
transport:
6+
name: exec
7+
8+
provisioner:
9+
name: cinc_infra
10+
product_name: cinc
11+
product_version: latest
12+
channel: stable
13+
deprecations_as_errors: true
14+
15+
verifier:
16+
name: inspec
17+
18+
platforms:
19+
- name: localhost
20+
provisioner:
21+
command_prefix: "unset BUNDLE_GEMFILE BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_WITHOUT RUBYOPT RUBYLIB GEM_PATH GEM_HOME;"
22+
23+
suites:
24+
- name: default
25+
run_list:
26+
- recipe[test_cookbook::default]
27+
verifier:
28+
inspec_tests:
29+
- test/integration/default

0 commit comments

Comments
 (0)