From b5b4a297650998845c3f35819e0a4b9185224423 Mon Sep 17 00:00:00 2001 From: Shajida Akthar Date: Mon, 30 Oct 2023 13:48:55 +0000 Subject: [PATCH 1/7] Testing ami pipeline cron schedule --- teams/hmpps/windows_server_2022/terraform.tfvars | 1 + 1 file changed, 1 insertion(+) diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index 3faab186..5609db65 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -40,6 +40,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } From 864edbe269897ba2ed6add5b915115b6c0e93c0f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 30 Oct 2023 13:52:45 +0000 Subject: [PATCH 2/7] Commit changes made by code formatters --- teams/hmpps/windows_server_2022/terraform.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index 5609db65..85eba0bc 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -39,7 +39,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } From bfe1c523f016a28d966a2c2d1bbc99a50ea65f98 Mon Sep 17 00:00:00 2001 From: Shajida Akthar Date: Mon, 30 Oct 2023 14:47:51 +0000 Subject: [PATCH 3/7] Incremeted version number of windows 22 --- teams/hmpps/windows_server_2022/terraform.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index 85eba0bc..b1695d44 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "hmpps" ami_base_name = "windows_server_2022" -configuration_version = "0.0.5" +configuration_version = "0.0.6" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "windows server 2022" From 64e5e9ad3184266aa25906022f31d64c7b30321e Mon Sep 17 00:00:00 2001 From: Shajida Akthar Date: Mon, 30 Oct 2023 15:18:29 +0000 Subject: [PATCH 4/7] pipeline_execution_start_condition = EXPRESSION_MATCH_ONLY on all core-shared-services-production cron images --- commonimages/base/shared.auto.tfvars | 1 + commonimages/base/windows_2012_r2/terraform.tfvars | 1 + commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars | 1 + teams/delius-core/oracle_db/terraform.tfvars | 1 + teams/delius-iaps/iaps_server/terraform.tfvars | 1 + teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars | 1 + teams/hmpps/rhel_8_5/terraform.tfvars | 1 + teams/hmpps/windows_server_2022/terraform.tfvars | 4 ++-- teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars | 1 + teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars | 1 + .../nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars | 1 + teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars | 1 + teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars | 1 + teams/oasys/bip/terraform.tfvars | 1 + teams/oasys/oracle_db/terraform.tfvars | 1 + teams/oasys/weblogic/terraform.tfvars | 1 + teams/oasys/webserver/terraform.tfvars | 1 + 17 files changed, 18 insertions(+), 2 deletions(-) diff --git a/commonimages/base/shared.auto.tfvars b/commonimages/base/shared.auto.tfvars index dba6414f..6b57baaf 100644 --- a/commonimages/base/shared.auto.tfvars +++ b/commonimages/base/shared.auto.tfvars @@ -4,6 +4,7 @@ ami_name_prefix = "base" image_pipeline = { schedule = { schedule_expression = "cron(0 0 1 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars index 1df9912b..fd3cfdd0 100644 --- a/commonimages/base/windows_2012_r2/terraform.tfvars +++ b/commonimages/base/windows_2012_r2/terraform.tfvars @@ -47,6 +47,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars index 36b313e2..c8fc4f92 100644 --- a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars +++ b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars @@ -45,6 +45,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/delius-core/oracle_db/terraform.tfvars b/teams/delius-core/oracle_db/terraform.tfvars index e6c67fdd..49150849 100644 --- a/teams/delius-core/oracle_db/terraform.tfvars +++ b/teams/delius-core/oracle_db/terraform.tfvars @@ -37,6 +37,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/delius-iaps/iaps_server/terraform.tfvars b/teams/delius-iaps/iaps_server/terraform.tfvars index a88ad7bd..fdab9cd8 100644 --- a/teams/delius-iaps/iaps_server/terraform.tfvars +++ b/teams/delius-iaps/iaps_server/terraform.tfvars @@ -104,6 +104,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars index c41b0ab9..5b2c02fe 100644 --- a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars +++ b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars @@ -91,6 +91,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/rhel_8_5/terraform.tfvars b/teams/hmpps/rhel_8_5/terraform.tfvars index 6282f9a3..ab7a1bba 100644 --- a/teams/hmpps/rhel_8_5/terraform.tfvars +++ b/teams/hmpps/rhel_8_5/terraform.tfvars @@ -46,6 +46,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index b1695d44..5609db65 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "hmpps" ami_base_name = "windows_server_2022" -configuration_version = "0.0.6" +configuration_version = "0.0.5" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "windows server 2022" @@ -39,7 +39,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars index d00f0967..45b52847 100644 --- a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars @@ -37,6 +37,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars index d1054cbe..0f26d8f4 100644 --- a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars @@ -37,6 +37,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars index 36557c37..b8f375f7 100644 --- a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars +++ b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars @@ -49,6 +49,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars index 4148ee6b..08cf4df0 100644 --- a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars +++ b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars @@ -93,6 +93,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars index 5fdf8633..b6a6c8bb 100644 --- a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars +++ b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars @@ -49,6 +49,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/bip/terraform.tfvars b/teams/oasys/bip/terraform.tfvars index 2a89d8e6..9bcfb709 100644 --- a/teams/oasys/bip/terraform.tfvars +++ b/teams/oasys/bip/terraform.tfvars @@ -59,6 +59,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/oracle_db/terraform.tfvars b/teams/oasys/oracle_db/terraform.tfvars index 08d395ae..d8e9daad 100644 --- a/teams/oasys/oracle_db/terraform.tfvars +++ b/teams/oasys/oracle_db/terraform.tfvars @@ -71,6 +71,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/weblogic/terraform.tfvars b/teams/oasys/weblogic/terraform.tfvars index c9cf741d..ff342625 100644 --- a/teams/oasys/weblogic/terraform.tfvars +++ b/teams/oasys/weblogic/terraform.tfvars @@ -45,6 +45,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/webserver/terraform.tfvars b/teams/oasys/webserver/terraform.tfvars index 4839d44a..59151b4a 100644 --- a/teams/oasys/webserver/terraform.tfvars +++ b/teams/oasys/webserver/terraform.tfvars @@ -59,6 +59,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { schedule_expression = "cron(0 0 2 * ? *)" + pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } From 8c3f362f09cde42b00f14ea4a8ca18ce4457dd7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 30 Oct 2023 15:29:41 +0000 Subject: [PATCH 5/7] Commit changes made by code formatters --- commonimages/base/shared.auto.tfvars | 2 +- commonimages/base/windows_2012_r2/terraform.tfvars | 2 +- commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars | 2 +- teams/delius-core/oracle_db/terraform.tfvars | 2 +- teams/delius-iaps/iaps_server/terraform.tfvars | 2 +- teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars | 2 +- teams/hmpps/rhel_8_5/terraform.tfvars | 2 +- teams/hmpps/windows_server_2022/terraform.tfvars | 2 +- teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars | 2 +- teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars | 2 +- teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars | 2 +- teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars | 2 +- teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars | 2 +- teams/oasys/bip/terraform.tfvars | 2 +- teams/oasys/oracle_db/terraform.tfvars | 2 +- teams/oasys/weblogic/terraform.tfvars | 2 +- teams/oasys/webserver/terraform.tfvars | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/commonimages/base/shared.auto.tfvars b/commonimages/base/shared.auto.tfvars index 6b57baaf..ec9d351d 100644 --- a/commonimages/base/shared.auto.tfvars +++ b/commonimages/base/shared.auto.tfvars @@ -3,7 +3,7 @@ ami_name_prefix = "base" image_pipeline = { schedule = { - schedule_expression = "cron(0 0 1 * ? *)" + schedule_expression = "cron(0 0 1 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars index fd3cfdd0..f4fe4486 100644 --- a/commonimages/base/windows_2012_r2/terraform.tfvars +++ b/commonimages/base/windows_2012_r2/terraform.tfvars @@ -46,7 +46,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars index c8fc4f92..86b69ab6 100644 --- a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars +++ b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars @@ -44,7 +44,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/delius-core/oracle_db/terraform.tfvars b/teams/delius-core/oracle_db/terraform.tfvars index 49150849..0b62e6b3 100644 --- a/teams/delius-core/oracle_db/terraform.tfvars +++ b/teams/delius-core/oracle_db/terraform.tfvars @@ -36,7 +36,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/delius-iaps/iaps_server/terraform.tfvars b/teams/delius-iaps/iaps_server/terraform.tfvars index fdab9cd8..d2a78fe8 100644 --- a/teams/delius-iaps/iaps_server/terraform.tfvars +++ b/teams/delius-iaps/iaps_server/terraform.tfvars @@ -103,7 +103,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars index 5b2c02fe..524185f9 100644 --- a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars +++ b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars @@ -90,7 +90,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/rhel_8_5/terraform.tfvars b/teams/hmpps/rhel_8_5/terraform.tfvars index ab7a1bba..5dda6cf9 100644 --- a/teams/hmpps/rhel_8_5/terraform.tfvars +++ b/teams/hmpps/rhel_8_5/terraform.tfvars @@ -45,7 +45,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index 5609db65..85eba0bc 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -39,7 +39,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars index 45b52847..88d0bfc2 100644 --- a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars @@ -36,7 +36,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars index 0f26d8f4..646e5045 100644 --- a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars @@ -36,7 +36,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars index b8f375f7..2180458b 100644 --- a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars +++ b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars @@ -48,7 +48,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars index 08cf4df0..1521e8d6 100644 --- a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars +++ b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars @@ -92,7 +92,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars index b6a6c8bb..bb007013 100644 --- a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars +++ b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars @@ -48,7 +48,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/bip/terraform.tfvars b/teams/oasys/bip/terraform.tfvars index 9bcfb709..6f3886e5 100644 --- a/teams/oasys/bip/terraform.tfvars +++ b/teams/oasys/bip/terraform.tfvars @@ -58,7 +58,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/oracle_db/terraform.tfvars b/teams/oasys/oracle_db/terraform.tfvars index d8e9daad..14767f66 100644 --- a/teams/oasys/oracle_db/terraform.tfvars +++ b/teams/oasys/oracle_db/terraform.tfvars @@ -70,7 +70,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/weblogic/terraform.tfvars b/teams/oasys/weblogic/terraform.tfvars index ff342625..b5205679 100644 --- a/teams/oasys/weblogic/terraform.tfvars +++ b/teams/oasys/weblogic/terraform.tfvars @@ -44,7 +44,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } diff --git a/teams/oasys/webserver/terraform.tfvars b/teams/oasys/webserver/terraform.tfvars index 59151b4a..7cb3aa2f 100644 --- a/teams/oasys/webserver/terraform.tfvars +++ b/teams/oasys/webserver/terraform.tfvars @@ -58,7 +58,7 @@ infrastructure_configuration = { image_pipeline = { schedule = { - schedule_expression = "cron(0 0 2 * ? *)" + schedule_expression = "cron(0 0 2 * ? *)" pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY" } } From e35ee4b98498ead03a481ce2a4fa08d7e1a2ff43 Mon Sep 17 00:00:00 2001 From: Shajida Akthar Date: Mon, 30 Oct 2023 15:37:07 +0000 Subject: [PATCH 6/7] Increment version number --- teams/hmpps/windows_server_2022/terraform.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars index 85eba0bc..b1695d44 100644 --- a/teams/hmpps/windows_server_2022/terraform.tfvars +++ b/teams/hmpps/windows_server_2022/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "hmpps" ami_base_name = "windows_server_2022" -configuration_version = "0.0.5" +configuration_version = "0.0.6" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "windows server 2022" From 1b678c802b9355034fc7b6d818a7f2d631b7d867 Mon Sep 17 00:00:00 2001 From: Shajida Akthar Date: Tue, 31 Oct 2023 15:54:34 +0000 Subject: [PATCH 7/7] Incremented configuration version numbers --- commonimages/base/windows_2012_r2/terraform.tfvars | 2 +- commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars | 2 +- teams/delius-core/oracle_db/terraform.tfvars | 2 +- teams/delius-iaps/iaps_server/terraform.tfvars | 2 +- teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars | 2 +- teams/hmpps/rhel_8_5/terraform.tfvars | 2 +- teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars | 2 +- teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars | 2 +- teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars | 2 +- teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars | 2 +- teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars | 2 +- teams/oasys/bip/terraform.tfvars | 2 +- teams/oasys/oracle_db/terraform.tfvars | 2 +- teams/oasys/weblogic/terraform.tfvars | 2 +- teams/oasys/webserver/terraform.tfvars | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars index f4fe4486..fdbde0f0 100644 --- a/commonimages/base/windows_2012_r2/terraform.tfvars +++ b/commonimages/base/windows_2012_r2/terraform.tfvars @@ -4,7 +4,7 @@ region = "eu-west-2" ami_base_name = "windows_server_2012_r2" -configuration_version = "0.1.0" +configuration_version = "0.1.1" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "Windows Server 2012 R2" diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars index 86b69ab6..fc74ec24 100644 --- a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars +++ b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars @@ -4,7 +4,7 @@ region = "eu-west-2" ami_base_name = "windows_server_2012_r2_SQL_2014_enterprise" -configuration_version = "0.0.4" +configuration_version = "0.0.5" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "Windows Server 2012 R2 with SQL 2014 Enterprise" diff --git a/teams/delius-core/oracle_db/terraform.tfvars b/teams/delius-core/oracle_db/terraform.tfvars index 0b62e6b3..e6c88549 100644 --- a/teams/delius-core/oracle_db/terraform.tfvars +++ b/teams/delius-core/oracle_db/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "delius_core_ol_8_5" ami_base_name = "oracle_db_19c" -configuration_version = "0.0.7" +configuration_version = "0.0.8" release_or_patch = "patch" # see nomis AMI image building strategy doc description = "Delius Core Oracle Database Image" diff --git a/teams/delius-iaps/iaps_server/terraform.tfvars b/teams/delius-iaps/iaps_server/terraform.tfvars index d2a78fe8..ceebaf1f 100644 --- a/teams/delius-iaps/iaps_server/terraform.tfvars +++ b/teams/delius-iaps/iaps_server/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "delius" ami_base_name = "iaps_server" -configuration_version = "0.0.31" +configuration_version = "0.0.32" release_or_patch = "patch" # see nomis AMI image building strategy doc description = "Delius IAPS server" diff --git a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars index 524185f9..530f1a34 100644 --- a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars +++ b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "hmpps" ami_base_name = "ol_8_5_oracledb_19c" -configuration_version = "0.0.4" +configuration_version = "0.0.5" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "hmpps oracle 19c image on oracle linux 8.5" diff --git a/teams/hmpps/rhel_8_5/terraform.tfvars b/teams/hmpps/rhel_8_5/terraform.tfvars index 5dda6cf9..0953ced4 100644 --- a/teams/hmpps/rhel_8_5/terraform.tfvars +++ b/teams/hmpps/rhel_8_5/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "hmpps" ami_base_name = "rhel_8_5_join_to_azure" -configuration_version = "0.0.1" +configuration_version = "0.0.2" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "hmpps rhel 8.5 join to Azure domain" diff --git a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars index 88d0bfc2..362eca18 100644 --- a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "nomis_data_hub" ami_base_name = "rhel_7_9_app" -configuration_version = "0.0.1" +configuration_version = "0.0.2" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "nomis data hub rhel 7.9 app image" diff --git a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars index 646e5045..bfb097a1 100644 --- a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars +++ b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "nomis_data_hub" ami_base_name = "rhel_7_9_ems" -configuration_version = "0.0.1" +configuration_version = "0.0.2" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "nomis data hub rhel 7.9 ems image" diff --git a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars index 2180458b..bbdd7f01 100644 --- a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars +++ b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "nomis" ami_base_name = "rhel_6_10_weblogic_appserver_10_3" -configuration_version = "0.2.4" +configuration_version = "0.2.5" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "nomis rhel 6.10 weblogic appserver image" diff --git a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars index 1521e8d6..9d070a17 100644 --- a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars +++ b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "nomis" ami_base_name = "rhel_7_9_oracledb_11_2" -configuration_version = "0.4.5" +configuration_version = "0.4.6" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "nomis rhel 7.9 oracleDB 11.2 image" diff --git a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars index bb007013..9a50f471 100644 --- a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars +++ b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "nomis" ami_base_name = "rhel_7_9_weblogic_xtag_10_3" -configuration_version = "0.0.4" +configuration_version = "0.0.5" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "nomis rhel 7.9 weblogic XTAG image" diff --git a/teams/oasys/bip/terraform.tfvars b/teams/oasys/bip/terraform.tfvars index 6f3886e5..1193c390 100644 --- a/teams/oasys/bip/terraform.tfvars +++ b/teams/oasys/bip/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "oasys" ami_base_name = "bip" -configuration_version = "0.0.1" +configuration_version = "0.0.2" release_or_patch = "release" description = "oasys bip image" diff --git a/teams/oasys/oracle_db/terraform.tfvars b/teams/oasys/oracle_db/terraform.tfvars index 14767f66..1a341b5b 100644 --- a/teams/oasys/oracle_db/terraform.tfvars +++ b/teams/oasys/oracle_db/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "oasys" ami_base_name = "oracle_db" -configuration_version = "0.1.0" +configuration_version = "0.1.1" release_or_patch = "release" description = "oasys oracle db image" diff --git a/teams/oasys/weblogic/terraform.tfvars b/teams/oasys/weblogic/terraform.tfvars index b5205679..468a12fd 100644 --- a/teams/oasys/weblogic/terraform.tfvars +++ b/teams/oasys/weblogic/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "oasys" ami_base_name = "weblogic" -configuration_version = "0.0.1" +configuration_version = "0.0.2" release_or_patch = "release" # or "patch", see nomis AMI image building strategy doc description = "oasys weblogic app server image" diff --git a/teams/oasys/webserver/terraform.tfvars b/teams/oasys/webserver/terraform.tfvars index 7cb3aa2f..1fb9975a 100644 --- a/teams/oasys/webserver/terraform.tfvars +++ b/teams/oasys/webserver/terraform.tfvars @@ -5,7 +5,7 @@ region = "eu-west-2" ami_name_prefix = "oasys" ami_base_name = "webserver" -configuration_version = "0.0.9" +configuration_version = "0.0.10" release_or_patch = "release" description = "oasys webserver image"