From 1289c66c678217a6896008a86267781a86a5d257 Mon Sep 17 00:00:00 2001 From: Martin Peck Date: Thu, 25 Apr 2024 11:36:39 -0700 Subject: [PATCH 1/2] Force system wide python module installs if needed. --- .gitlab-ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d31711f..81e91f62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ build_qa: - docker push "$ECR_API_BASE_URL/qa/alegre/api:latest" only: - develop + - bugfix/build-deps deploy_qa: image: python:3-alpine @@ -35,10 +36,10 @@ deploy_qa: AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION script: - apk add --no-cache curl python3 py3-pip git - - pip install botocore==1.31.58 - - pip install boto3==1.28.58 - - pip install ecs-deploy==1.14.0 - - pip install awscli==1.29.59 + - pip install botocore==1.31.58 --break-system-packages + - pip install boto3==1.28.58 --break-system-packages + - pip install ecs-deploy==1.14.0 --break-system-packages + - pip install awscli==1.29.59 --break-system-packages - aws ssm get-parameters-by-path --region $AWS_DEFAULT_REGION --path /qa/alegre/ --recursive --with-decryption --output text --query "Parameters[].[Name]" | sed -E 's#/qa/alegre/##' > env.qa.names - for NAME in `cat env.qa.names`; do echo -n "-s qa-alegre-c $NAME /qa/alegre/$NAME " >> qa-alegre-c.env.args; done - ecs deploy ecs-qa qa-alegre --diff --image qa-alegre-c $QA_ECR_API_BASE_URL:$CI_COMMIT_SHA --timeout 1200 --exclusive-env -e qa-alegre-c APP alegre -e qa-alegre-c PERSISTENT_DISK_PATH /mnt/models/video -e qa-alegre-c DEPLOY_ENV qa -e qa-alegre-c ALEGRE_PORT 8000 --exclusive-secrets `cat qa-alegre-c.env.args` @@ -57,6 +58,7 @@ deploy_qa: - echo "new Image was deployed $QA_ECR_API_BASE_URL:$CI_COMMIT_SHA" only: - develop + - bugfix/build-deps build_live: image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest @@ -89,10 +91,10 @@ deploy_live: AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION script: - apk add --no-cache curl jq python3 py3-pip git - - pip install botocore==1.31.58 - - pip install boto3==1.28.58 - - pip install ecs-deploy==1.14.0 - - pip install awscli==1.29.59 + - pip install botocore==1.31.58 --break-system-packages + - pip install boto3==1.28.58 --break-system-packages + - pip install ecs-deploy==1.14.0 --break-system-packages + - pip install awscli==1.29.59 --break-system-packages - aws ssm get-parameters-by-path --region $AWS_DEFAULT_REGION --path /live/alegre/ --recursive --with-decryption --output text --query "Parameters[].[Name]" | sed -E 's#/live/alegre/##' > env.live.names - for NAME in `cat env.live.names`; do echo -n "-s live-alegre-c $NAME /live/alegre/$NAME " >> live-alegre-c.env.args; done - ecs deploy ecs-live live-alegre --image live-alegre-c $LIVE_ECR_API_BASE_URL:$CI_COMMIT_SHA --timeout 1200 --exclusive-env -e live-alegre-c APP alegre -e live-alegre-c PERSISTENT_DISK_PATH /mnt/models/video -e live-alegre-c DEPLOY_ENV live -e live-alegre-c ALEGRE_PORT 8000 --exclusive-secrets `cat live-alegre-c.env.args` From 98900237eb346192b28a5517c7c7ac424c8a2ec9 Mon Sep 17 00:00:00 2001 From: Martin Peck Date: Thu, 25 Apr 2024 13:23:36 -0700 Subject: [PATCH 2/2] Remove builds for this branch in preparation for merge. --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e91f62..ce3dcf67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,6 @@ build_qa: - docker push "$ECR_API_BASE_URL/qa/alegre/api:latest" only: - develop - - bugfix/build-deps deploy_qa: image: python:3-alpine @@ -58,7 +57,6 @@ deploy_qa: - echo "new Image was deployed $QA_ECR_API_BASE_URL:$CI_COMMIT_SHA" only: - develop - - bugfix/build-deps build_live: image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest