Skip to content

Golden test r1 #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Golden test r1 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9dc1a4
stability: rename file logging feature flag variables
matthewfala Nov 4, 2023
3348f8e
stability: upgrade to arena private subnet with 32763 ip addresses
matthewfala Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/firelens-stability/collections/ecs-firelens-stability-tests/suite-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dashboard": "{{definitions.collectionUniqueName}}",
"lists.dashboardWidgets": [
{
"name": "{{config.collectionUniqueName}}",
"name": "title-{{config.collectionUniqueName}}",
"section": "0_{{config.collectionUniqueName}}",
"config": {
"type": "text",
Expand All @@ -20,7 +20,7 @@
"width": 24,
"height": 6,
"properties": {
"markdown": "# Stability Test {{managed.executionName}}-{{managed.executionId}} \nThis dashboard is autogenerated by the FireLens stability test framework.\n## Test details\n**Cluster**: {{definitions.clusterName}}\n\n**Dashboard**: A link to this dashboard: [{{definitions.collectionUniqueName}}](#dashboards:name={{definitions.collectionUniqueName}}). \n "
"markdown": "# Stability Test {{managed.executionName}}-{{managed.executionId}} \nThis dashboard is autogenerated by the FireLens stability test framework.\n## Test details\n**Cluster**: [{{definitions.clusterName}}](https://us-west-2.console.aws.amazon.com/ecs/v2/clusters/{{definitions.clusterName}}/tasks?region=us-west-2)\n\n**Dashboard**: A link to this dashboard: [{{definitions.collectionUniqueName}}](#dashboards:name={{definitions.collectionUniqueName}}). \n "
}
}
},
Expand Down
5 changes: 2 additions & 3 deletions apps/firelens-stability/config/collection-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
"config": {
"region": "us-west-2",
"taskVpcSubnets": [
"subnet-078f461abe5af0a04",
"subnet-0cac11db3d721bddb"
"subnet-04b8799d6b53585fa"
],
"taskVpcSecurityGroups": [
"sg-087206043d26db005"
"sg-008bce72f5d6251be"
]
}
}
17 changes: 10 additions & 7 deletions apps/firelens-stability/lib/helpers/start-execution-stages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,24 @@ export async function hydrateTestCaseSeed(testCaseSeed: ITestCaseSeed):
};

const layer2Config = cascadeConfigurationStringAsExtension(testCaseSeed.collectionConfigSeed, baseConfig);
const layer3Config = cascadeConfigurationStringAsExtension(testCaseSeed.suiteConfigSeed, layer2Config);
const layer4Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseConfigSeed, layer3Config);
const layer5Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseSeed, layer4Config);
const layer2ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer2Config);
const layer3Config = cascadeConfigurationStringAsExtension(testCaseSeed.suiteConfigSeed, layer2ExecutionOverride);
const layer3ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer3Config);
const layer4Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseConfigSeed, layer3ExecutionOverride);
const layer4ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer4Config);
const layer5Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseSeed, layer4ExecutionOverride);

/* Apply execution config before and after template to ensure overrides are set - allow set template */
const layer6Config = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer5Config);
const layer5ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer5Config);

/* Get template */
const templateName = layer6Config.config.template;
const templateName = layer5ExecutionOverride.config.template;
if (!templateName) {
validateTestConfig(layer6Config);
validateTestConfig(layer5ExecutionOverride);
}
const templateConfigPath = Path.join(Constants.paths.templates, templateName, Constants.fileNames.templateDefaultConfig);
const templateConfig = await getStringFromFile(templateConfigPath);
const layer7Config = cascadeConfigurationStringAsDefault(templateConfig, layer6Config);
const layer7Config = cascadeConfigurationStringAsDefault(templateConfig, layer5ExecutionOverride);

/* Final layer of configuration from execution seed. These function as overrides. */
const config = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer7Config);
Expand Down
4 changes: 2 additions & 2 deletions ...relens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ServiceName": "golden-onepod-low-throughput",
"debugS3Bucket": "{{managed.s3OutputBucket}}",
"debugS3KeyPrefix": "{{managed.s3OutputExecutionPath}}/{{managed.caseNameUnique}}",
"is_datajet_tail_enable": true,
"is_fluent_bit_tail_enable": true
"is_datajet_tail_enabled": true,
"is_fluent_bit_tail_enabled": true
}
}
2 changes: 1 addition & 1 deletion ...lens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/firelens-datajet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"batchRate": {{definitions.kbps_throughput_forward}}
}
},
{{#if definitions.is_datajet_tail_enable}}
{{#if definitions.is_datajet_tail_enabled}}
{
"comment": "service log to tail",
"generator": {
Expand Down
2 changes: 1 addition & 1 deletion apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/fluent-bit.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# 64MB = 512MB / 2 / (4 INPUT sections)
Mem_Buf_Limit 64MB

{{#if definitions.is_fluent_bit_tail_enable}}
{{#if definitions.is_fluent_bit_tail_enabled}}
[INPUT]
Name tail
Tag ServiceMetrics
Expand Down
6 changes: 3 additions & 3 deletions ...elens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/task-definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"awslogs-stream-prefix": "{{managed.caseNameUnique}}-fluent-bit"
}
},
{{#if definitions.is_fluent_bit_tail_enable}}
{{#if definitions.is_fluent_bit_tail_enabled}}
"mountPoints": [
{
"sourceVolume": "my-shared-volume",
Expand Down Expand Up @@ -177,7 +177,7 @@
"awslogs-stream-prefix": "{{managed.caseNameUnique}}-datajet"
}
},
{{#if definitions.is_fluent_bit_tail_enable}}
{{#if definitions.is_fluent_bit_tail_enabled}}
"mountPoints": [
{
"sourceVolume": "my-shared-volume",
Expand Down Expand Up @@ -245,7 +245,7 @@
}
],
"memory": "4096",
"cpu": "1024"{{#if definitions.is_fluent_bit_tail_enable}},
"cpu": "1024"{{#if definitions.is_fluent_bit_tail_enabled}},
"volumes": [
{
"name": "my-shared-volume"
Expand Down
4 changes: 2 additions & 2 deletions apps/firelens-stability/templates/s3-fargate-v04-05-2023/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"5172",
"5173"
],
"is_datajet_tail_enable": true,
"is_fluent_bit_tail_enable": true
"is_datajet_tail_enabled": true,
"is_fluent_bit_tail_enabled": true
}
}
6 changes: 3 additions & 3 deletions apps/firelens-stability/templates/s3-fargate-v04-05-2023/task-definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"awslogs-create-group": "true",
"awslogs-stream-prefix": "{{managed.caseNameUnique}}-fluent-bit"
}
}{{#if definitions.is_fluent_bit_tail_enable}},
}{{#if definitions.is_fluent_bit_tail_enabled}},
"mountPoints": [
{
"sourceVolume": "my-shared-volume",
Expand Down Expand Up @@ -94,7 +94,7 @@
"awslogs-stream-prefix": "{{managed.caseNameUnique}}-datajet"
}
},
{{#if definitions.is_fluent_bit_tail_enable}}
{{#if definitions.is_fluent_bit_tail_enabled}}
"mountPoints": [
{
"sourceVolume": "my-shared-volume",
Expand Down Expand Up @@ -131,7 +131,7 @@
}
],
"memory": "4096",
"cpu": "1024"{{#if definitions.is_fluent_bit_tail_enable}},
"cpu": "1024"{{#if definitions.is_fluent_bit_tail_enabled}},
"volumes": [
{
"name": "my-shared-volume"
Expand Down