Skip to content

Commit b1d2359

Browse files
author
Néstor Salceda
authored
chore: CI cleanup (#21)
* chore: CI cleanup * fix: Use a non deprecated action * fix: Specify head version for ruby * fix: Allow to use linux in the lock * fix: Use ruby 2.7 to test this
1 parent 0f467e6 commit b1d2359

File tree

4 files changed

+38
-56
lines changed

4 files changed

+38
-56
lines changed

.github/workflows/ci-pull-request.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pre-Commit
1+
name: CI - Pull Request
22

33
on:
44
pull_request:
@@ -109,3 +109,29 @@ jobs:
109109
# Run all pre-commit checks on max version supported
110110
if: ${{ matrix.version == needs.getTerraformMinMaxVersion.outputs.maxVersion }}
111111
run: pre-commit run --color=always --show-diff-on-failure --all-files
112+
113+
integration_test:
114+
name: Test-Kitchen
115+
runs-on: ubuntu-latest
116+
env:
117+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
118+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
119+
AWS_REGION: ${{ secrets.AWS_REGION }}
120+
TF_VAR_sysdig_secure_endpoint: https://secure.sysdig.com
121+
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}
122+
123+
steps:
124+
- name: Checkout
125+
uses: actions/checkout@v2
126+
127+
- uses: ruby/setup-ruby@v1
128+
with:
129+
ruby-version: 2.7
130+
bundler-cache: true
131+
132+
- name: Run test
133+
run: bundle exec kitchen test
134+
135+
- name: Destroy resources
136+
if: ${{ failure() }}
137+
run: bundle exec kitchen destroy

.github/workflows/kitchen-pull-request.yaml

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

Gemfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
source "https://rubygems.org/" do
2-
gem "kitchen-terraform", "~> 6.0.0"
3-
gem 'aws-sdk', '~> 3.0.1'
4-
gem 'awspec', '~> 1.24.0'
5-
gem 'kitchen-verifier-awspec', '~> 0.2.0'
6-
gem 'rhcl', '~> 0.1.0' # ruby hcl parser
7-
end
1+
source "https://rubygems.org/"
2+
3+
gem "kitchen-terraform", "~> 6.0.0"
4+
gem 'aws-sdk', '~> 3.0.1'
5+
gem 'awspec', '~> 1.24.0'
6+
gem 'kitchen-verifier-awspec', '~> 0.2.0'

Gemfile.lock

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
GEM
2-
specs:
3-
41
GEM
52
remote: https://rubygems.org/
63
specs:
@@ -1176,7 +1173,6 @@ GEM
11761173
coderay (1.1.3)
11771174
concurrent-ruby (1.1.9)
11781175
declarative (0.0.20)
1179-
deep_merge (1.2.1)
11801176
delegate (0.1.0)
11811177
diff-lcs (1.4.4)
11821178
docker-api (2.2.0)
@@ -1371,8 +1367,6 @@ GEM
13711367
uber (< 0.2.0)
13721368
retriable (3.1.2)
13731369
rexml (3.2.5)
1374-
rhcl (0.1.0)
1375-
deep_merge
13761370
rspec (3.10.0)
13771371
rspec-core (~> 3.10.0)
13781372
rspec-expectations (~> 3.10.0)
@@ -1567,14 +1561,13 @@ GEM
15671561

15681562
PLATFORMS
15691563
universal-darwin-20
1564+
x86_64-linux
15701565

15711566
DEPENDENCIES
1572-
aws-sdk (~> 3.0.1)!
1573-
awspec (~> 1.24.0)!
1574-
json (~> 2.5)!
1575-
kitchen-terraform (~> 6.0.0)!
1576-
kitchen-verifier-awspec (~> 0.2.0)!
1577-
rhcl (~> 0.1.0)!
1567+
aws-sdk (~> 3.0.1)
1568+
awspec (~> 1.24.0)
1569+
kitchen-terraform (~> 6.0.0)
1570+
kitchen-verifier-awspec (~> 0.2.0)
15781571

15791572
BUNDLED WITH
15801573
2.2.26

0 commit comments

Comments
 (0)