Skip to content

Commit

Permalink
Merge branch 'main' into new-scala-libs
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-butcher authored Jan 9, 2025
2 parents c06c5d1 + 26dc81a commit 0663552
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 42 deletions.
4 changes: 2 additions & 2 deletions builds/deploy_catalogue_pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ then

echo "Deploying λ pipeline services to catalogue-$PIPELINE_DATE"
"$ROOT/builds/deploy_lambda_services.sh" \
batcher \
relation_embedder
batcher:r_embed_batcher \
relation_embedder:r_embed_embedder
fi

13 changes: 10 additions & 3 deletions builds/deploy_lambda_services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@ set -o pipefail
PIPELINE_NAMESPACE="catalogue-$PIPELINE_DATE"
REPOSITORY_URI="760097843905.dkr.ecr.eu-west-1.amazonaws.com"

for SERVICE_NAME in "$@"
for FUNCTION_SUFFIX_IMAGE_NAME_PAIR in "$@"
do
IMAGE_URI="${REPOSITORY_URI}"/uk.ac.wellcome/"${SERVICE_NAME}":"env.${PIPELINE_DATE}"
FUNCTION_NAME="${PIPELINE_NAMESPACE}"-"${SERVICE_NAME}"
# See https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
# for an explanation of the syntax used here.
# %:* removes the shortest matching pattern of "colon followed by any characters"
# #*: removes the shortest matching pattern of "any characters followed by a colon"
IMAGE_NAME="${FUNCTION_SUFFIX_IMAGE_NAME_PAIR%:*}"
FUNCTION_SUFFIX="${FUNCTION_SUFFIX_IMAGE_NAME_PAIR#*:}"

IMAGE_URI="${REPOSITORY_URI}"/uk.ac.wellcome/"${IMAGE_NAME}":"env.${PIPELINE_DATE}"
FUNCTION_NAME="${PIPELINE_NAMESPACE}"-"${FUNCTION_SUFFIX}"

echo "Deploying ${IMAGE_URI} to ${FUNCTION_NAME}, @ $(date) ..."

Expand Down
68 changes: 31 additions & 37 deletions pipeline/terraform/2024-11-18/main.tf
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
# DEACTIVATED - 2024-12-16
# This pipeline has been deactivated over the winter break,
# to save costs and will be reactivated in the new year.
# We need to keep this folder, so that new deploys don't go
# to the production environment.
module "pipeline" {
source = "../modules/stack"

# module "pipeline" {
# source = "../modules/stack"
#
# reindexing_state = {
# listen_to_reindexer = false
# scale_up_tasks = false
# scale_up_elastic_cluster = false
# scale_up_id_minter_db = false
# scale_up_matcher_db = false
# }
#
# index_config = {
# works = {
# identified = "works_identified.2023-05-26"
# merged = "works_merged.2023-05-26"
# indexed = "works_indexed.2024-11-14"
# }
# images = {
# indexed = "images_indexed.2024-11-14"
# works_analysis = "works_indexed.2024-11-06"
# }
# }
#
# allow_delete_indices = true
#
# pipeline_date = local.pipeline_date
# release_label = local.pipeline_date
#
# providers = {
# aws.catalogue = aws.catalogue
# }
# }
reindexing_state = {
listen_to_reindexer = true
scale_up_tasks = true
scale_up_elastic_cluster = true
scale_up_id_minter_db = true
scale_up_matcher_db = true
}

index_config = {
works = {
identified = "works_identified.2023-05-26"
merged = "works_merged.2023-05-26"
indexed = "works_indexed.2024-11-14"
}
images = {
indexed = "images_indexed.2024-11-14"
works_analysis = "works_indexed.2024-11-06"
}
}

allow_delete_indices = false

pipeline_date = local.pipeline_date
release_label = local.pipeline_date

providers = {
aws.catalogue = aws.catalogue
}
}

0 comments on commit 0663552

Please sign in to comment.