Skip to content

Commit

Permalink
Merge pull request #612 from ministryofjustice/dso-2321/ami-pipeline-…
Browse files Browse the repository at this point in the history 
…fix-cron

Dso 2321/ami pipeline fix cron
  • Loading branch information
@shajida95
shajida95 authored Oct 31, 2023
2 parents fb51914 + 1b678c8 commit 121ec09
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 33 deletions.
3 changes: 2 additions & 1 deletion commonimages/base/shared.auto.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ 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"
}
}

Expand Down
5 changes: 3 additions & 2 deletions commonimages/base/windows_2012_r2/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -46,7 +46,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -44,7 +44,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/delius-core/oracle_db/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -36,7 +36,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/delius-iaps/iaps_server/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -103,7 +103,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -90,7 +90,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/hmpps/rhel_8_5/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -45,7 +45,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/hmpps/windows_server_2022/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -39,7 +39,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -36,7 +36,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -36,7 +36,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -48,7 +48,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -92,7 +92,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -48,7 +48,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/oasys/bip/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -58,7 +58,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/oasys/oracle_db/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -70,7 +70,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/oasys/weblogic/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -44,7 +44,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down
5 changes: 3 additions & 2 deletions teams/oasys/webserver/terraform.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -58,7 +58,8 @@ infrastructure_configuration = {

image_pipeline = {
schedule = {
schedule_expression = "cron(0 0 2 * ? *)"
schedule_expression = "cron(0 0 2 * ? *)"
pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
}
}

Expand Down

0 comments on commit 121ec09

Please sign in to comment.