Skip to content

Commit d3c1848

Browse files
author
iru
authored
chore(tests): enable benchmarks to ci/cd tests (#29)
* chore(tests): enable benchmarks to ci/cd tests * chore(tests): use aws-qa-cloudvision account due to 409 conflicts on draios-demo * chore(tests): enable remote state
1 parent 775a02e commit d3c1848

File tree

17 files changed

+22
-232
lines changed

17 files changed

+22
-232
lines changed

.github/workflows/ci-integration-cleanup-force.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Test Cleanup
1414
runs-on: ubuntu-latest
1515
env:
16-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
17-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
16+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_QA_ACCESS_KEY_ID }}
17+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_QA_SECRET_ACCESS_KEY }}
1818
AWS_REGION: ${{ secrets.AWS_REGION }}
1919
TF_VAR_sysdig_secure_endpoint: https://secure.sysdig.com
2020
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}

.github/workflows/ci-integration-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
name: Test-Kitchen
1616
runs-on: ubuntu-latest
1717
env:
18-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
19-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
18+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_QA_ACCESS_KEY_ID }}
19+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_QA_SECRET_ACCESS_KEY }}
2020
AWS_REGION: ${{ secrets.AWS_REGION }}
2121
TF_VAR_sysdig_secure_endpoint: https://secure.sysdig.com
2222
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}

.github/workflows/ci-test-cleanup.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
name: Test Cleanup
88
runs-on: ubuntu-latest
99
env:
10-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
11-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
10+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_QA_ACCESS_KEY_ID }}
11+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_QA_SECRET_ACCESS_KEY }}
1212
AWS_REGION: ${{ secrets.AWS_REGION }}
1313
TF_VAR_sysdig_secure_endpoint: https://secure.sysdig.com
1414
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ override.tf.json
4242

4343
#Kitchen test
4444
.kitchen/*
45-
test/fixtures/tf_module/.kitchen/
45+
test/fixtures/single-account/.kitchen/

.kitchen.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
driver:
33
name: terraform
4-
root_module_directory: test/fixtures/tf_module
4+
root_module_directory: test/fixtures/single-account
55
# ################
6-
# Uncomment the following two lines if you are deploying /test/fixture/tf_module/main.tf
6+
# Uncomment the following two lines if you are deploying /test/fixture/single-account/main.tf
77
# using custom tfvars file
88
# variable_files:
9-
# - test/fixtures/tf_module/test.tfvars
9+
# - test/fixtures/single-account/test.tfvars
1010
# ################
1111
parallelism: 4
1212

examples-internal/single-account-without-bench/main.tf

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

examples-internal/single-account-without-bench/variables.tf

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

examples-internal/single-account-without-bench/versions.tf

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Terraform state storage backend
2+
terraform {
3+
backend "s3" {
4+
bucket = "terraform-cicd-tests"
5+
key = "single-account/terraform.tfstate"
6+
dynamodb_table = "terraform-cicd-test"
7+
region = "eu-west-3"
8+
}
9+
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
provider "aws" {}
21
module "cloudvision_aws_single_account" {
3-
source = "../../../examples-internal/single-account-without-bench"
2+
source = "../../../examples/single-account"
43

54
sysdig_secure_api_token = var.sysdig_secure_api_token
65
sysdig_secure_endpoint = var.sysdig_secure_endpoint
7-
name = var.name
6+
name = "quicktest-${var.name}"
87
region = var.region
98
}

0 commit comments

Comments
 (0)