Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cloud_governance/main/environment_variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def __init__(self):
EnvironmentVariables.get_env('POLICIES_TO_ALERT', '[]'))
self._environment_variables_dict['ADMIN_MAIL_LIST'] = EnvironmentVariables.get_env('ADMIN_MAIL_LIST', '')
self._environment_variables_dict['SKIP_POLICIES_ALERT'] = literal_eval(
EnvironmentVariables.get_env('SKIP_POLICIES_ALERT', "['']"))
EnvironmentVariables.get_env('SKIP_POLICIES_ALERT', '[]'))
if self._environment_variables_dict.get('policy') in ['send_aggregated_alerts', 'cloudability_cost_reports']:
self._environment_variables_dict['COMMON_POLICIES'] = True
# CRO -- Cloud Resource Orch
Expand Down
4 changes: 2 additions & 2 deletions jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pipeline {
// By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py
// POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode
POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]'
SKIP_POLICIES_ALERT = '["unused_access_key"]'
SKIP_POLICIES_ALERT = ["unused_access_key"]
}
stages {
stage('Checkout') { // Checkout (git clone ...) the projects repository
Expand Down Expand Up @@ -80,7 +80,7 @@ pipeline {
string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
if (account == 'industry-partners') {
env.SKIP_POLICIES_ALERT = '[]'
env.SKIP_POLICIES_ALERT = []
}
env.account_name = "${account}"
env.ADMIN_MAIL_LIST = "${accounts_list[account]}"
Expand Down
2 changes: 1 addition & 1 deletion jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pipeline {
// By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py
// POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode
POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]'
SKIP_POLICIES_ALERT = '["unused_access_key"]'
SKIP_POLICIES_ALERT = ["unused_access_key"]
}
stages {
stage('Checkout') { // Checkout (git clone ...) the projects repository
Expand Down
2 changes: 1 addition & 1 deletion jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipeline {
// By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py
// POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode
POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]'
SKIP_POLICIES_ALERT = '["unused_access_key"]'
SKIP_POLICIES_ALERT = ["unused_access_key"]
}
stages {
stage('Checkout') { // Checkout (git clone ...) the projects repository
Expand Down