Commit 5c4741cf authored by Spencer Sutton's avatar Spencer Sutton
Browse files

Merge branch 'aws-blue-update' into 'master'

Aws blue update

See merge request !285
parents 5a44d5a9 1459bd9e
Pipeline #51878 passed with stages
in 19 seconds
.aws_base_variables:
variables:
# Uncomment these variables and resplace concat-vars below once GL is updated to 13.10+
# AWS_API_GW_DOMAIN: ${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
# AWS_API_GW_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
AWS_COGNITO_CLIENT_ID: $AWS_GREEN_COGNITO_CLIENT_ID
AWS_COGNITO_USER_POOL_ID: $AWS_GREEN_COGNITO_USER_POOL_ID
# AWS_RESOURCE_PREFIX: $AWS_GREEN_RESOURCE_PREFIX
# AWS_API_GW_DOMAIN: ${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
# AWS_API_GW_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
AWS_COGNITO_CLIENT_ID: $AWS_BLUE_COGNITO_CLIENT_ID
AWS_COGNITO_USER_POOL_ID: $AWS_BLUE_COGNITO_USER_POOL_ID
# AWS_RESOURCE_PREFIX: $AWS_BLUE_RESOURCE_PREFIX
# AWS_ELASTIC_HOST: $AWS_SANDBOX_ELASTIC_HOST
# AWS_S3_LEGAL_CONFIG_BUCKET: $AWS_GREEN_S3_LEGAL_CONFIG_BUCKET
AWS_REGION: $AWS_GREEN_REGION
# AWS_S3_LEGAL_CONFIG_BUCKET: $AWS_BLUE_S3_LEGAL_CONFIG_BUCKET
AWS_REGION: $AWS_BLUE_REGION
AWS_ECR_REGION: us-east-1
.aws_variables:
......@@ -24,7 +24,7 @@
APPLICATION_NAME: os-$AWS_SERVICE
LOCAL_IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
AWS_IMAGE_TAG_BASE: ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_ECR_REGION}.amazonaws.com/os-${AWS_SERVICE}
LEGALTAG_BASE_URL: ${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
LEGALTAG_BASE_URL: ${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
OTHER_RELEVANT_DATA_COUNTRIES: $AWS_OTHER_RELEVANT_DATA_COUNTRIES
LEGAL_TAG : $AWS_LEGAL_TAG
TENANT_NAME : $AWS_TENANT_NAME
......@@ -32,77 +32,77 @@
PRIVATE_TENANT2: tenant2
SHARED_TENANT: $AWS_DEFAULT_DATA_PARTITION_ID_TENANT2
VENDOR: aws
STORAGE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
STORAGE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
DOMAIN: example.com
LEGAL_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
LEGAL_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
AWS_COGNITO_AUTH_FLOW: $AWS_COGNITO_AUTH_FLOW
AWS_COGNITO_AUTH_PARAMS_PASSWORD: $AWS_COGNITO_AUTH_PARAMS_PASSWORD
AWS_COGNITO_AUTH_PARAMS_USER: $AWS_COGNITO_AUTH_PARAMS_USER
AWS_COGNITO_AUTH_PARAMS_USER_NO_ACCESS: $AWS_COGNITO_AUTH_PARAMS_USER_NO_ACCESS
AWS_COGNITO_REGION: $AWS_GREEN_REGION
AWS_COGNITO_REGION: $AWS_BLUE_REGION
AWS_ACCOUNT_ID: $AWS_ACCOUNT_ID
DEPLOY_ENV: empty
HOST_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
HOST_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
MY_TENANT: $AWS_TENANT_NAME
ENTITLEMENTS_TEST_TENANT: $AWS_ENTITLEMENTS_TEST_TENANT
AWS_S3_ENDPOINT: s3.${AWS_GREEN_REGION}.amazonaws.com
AWS_S3_REGION: $AWS_GREEN_REGION
AWS_S3_ENDPOINT: s3.${AWS_BLUE_REGION}.amazonaws.com
AWS_S3_REGION: $AWS_BLUE_REGION
LOG_LEVEL: INFO
SKIP_HTTP_TESTS: 'true'
S3_LEGAL_CONFIG_BUCKET: $AWS_GREEN_S3_LEGAL_CONFIG_BUCKET
LEGAL_QUEUE: https://sqs.${AWS_GREEN_REGION}.amazonaws.com/${AWS_ACCOUNT_ID}/${AWS_GREEN_RESOURCE_PREFIX}-legal-queue
TABLE_PREFIX: $AWS_GREEN_RESOURCE_PREFIX
RESOURCE_PREFIX: $AWS_GREEN_RESOURCE_PREFIX
DYNAMO_DB_REGION: $AWS_GREEN_REGION
DYNAMO_DB_ENDPOINT: dynamodb.${AWS_GREEN_REGION}.amazonaws.com
S3_LEGAL_CONFIG_BUCKET: $AWS_BLUE_S3_LEGAL_CONFIG_BUCKET
LEGAL_QUEUE: https://sqs.${AWS_BLUE_REGION}.amazonaws.com/${AWS_ACCOUNT_ID}/${AWS_BLUE_RESOURCE_PREFIX}-legal-queue
TABLE_PREFIX: $AWS_BLUE_RESOURCE_PREFIX
RESOURCE_PREFIX: $AWS_BLUE_RESOURCE_PREFIX
DYNAMO_DB_REGION: $AWS_BLUE_REGION
DYNAMO_DB_ENDPOINT: dynamodb.${AWS_BLUE_REGION}.amazonaws.com
DELIVERY_INT_TEST_BUCKET_NAME: $AWS_DELIVERY_INT_TEST_BUCKET_NAME
DEFAULT_DATA_PARTITION_ID_TENANT1: $AWS_DEFAULT_DATA_PARTITION_ID_TENANT1
DEFAULT_DATA_PARTITION_ID_TENANT2: $AWS_DEFAULT_DATA_PARTITION_ID_TENANT2
#used by file->delivery int tests
DATA_PARTITION_ID: int-test-file
SEARCH_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/search/v2/
STORAGE_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
LEGAL_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
DELIVERY_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/delivery/v2/
SEARCH_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/search/v2/
STORAGE_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
LEGAL_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
DELIVERY_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/delivery/v2/
ENTITLEMENTS_DOMAIN: example.com
ELASTIC_HOST: $AWS_GREEN_ELASTIC_HOST
ELASTIC_HOST: $AWS_BLUE_ELASTIC_HOST
ELASTIC_PORT: 9200
ELASTIC_USER_NAME: $AWS_ELASTIC_USERNAME
ELASTIC_PASSWORD: $AWS_GREEN_ELASTIC_PASSWORD
INDEXER_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/indexer/v2/
AWS_CLUSTER_NAME: ${AWS_GREEN_RESOURCE_PREFIX}-core-cluster
ENTITLEMENTS_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v1/
VIRTUAL_SERVICE_HOST_NAME: ${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
ELASTIC_PASSWORD: $AWS_BLUE_ELASTIC_PASSWORD
INDEXER_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/indexer/v2/
AWS_CLUSTER_NAME: ${AWS_BLUE_RESOURCE_PREFIX}-core-cluster
ENTITLEMENTS_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v2/
VIRTUAL_SERVICE_HOST_NAME: ${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
#needs trailing slash
PARTITION_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/
WORKFLOW_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/workflow/
DATA_WORKFLOW_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/data-workflow/v1
PARTITION_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/
WORKFLOW_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/workflow/
DATA_WORKFLOW_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/data-workflow/v1
TEST_DAG_NAME: my_first_dag
REGISTER_CUSTOM_PUSH_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge
REGISTER_CUSTOM_PUSH_URL1: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge/1
REGISTER_CUSTOM_PUSH_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge
REGISTER_CUSTOM_PUSH_URL1: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge/1
#needs trailing slash
REGISTER_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/
REGISTER_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/
SUBSCRIBER_SECRET: $AWS_SUBSCRIBER_SECRET
HMAC_SECRET: $AWS_HMAC_SECRET
REGISTER_CUSTOM_PUSH_URL_HMAC: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge/1
NOTIFICATION_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/notification/v1/
NOTIFICATION_REGISTER_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
FILE_SERVICE_HOST: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/file/v2
STORAGE_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
DATASET_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/dataset/v1/
REGISTER_CUSTOM_PUSH_URL_HMAC: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/register/v1/awstest/aws/challenge/1
NOTIFICATION_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/notification/v1/
NOTIFICATION_REGISTER_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
FILE_SERVICE_HOST: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/file/v2
STORAGE_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/storage/v2/
DATASET_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/dataset/v1/
PROVIDER_KEY: AWS_S3
LEGAL_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
ENTITLEMENTS_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v1/
FILEDMS_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/dms/file/v1/
SEISMICSTORE_SVC_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/seismic-store/v3
WELLBORE_DDMS_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/os-wellbore-ddms
AWS_BASE_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}
LEGAL_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/legal/v1/
ENTITLEMENTS_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v2/
FILEDMS_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/dms/file/v1/
SEISMICSTORE_SVC_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/seismic-store/v3
WELLBORE_DDMS_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/os-wellbore-ddms
AWS_BASE_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}
#File Service Variables
TIME_ZONE: UTC
USER_ID: $AWS_COGNITO_AUTH_PARAMS_USER
#Entitlements V2 variables--start--
ENTITLEMENT_V2_URL: https://${AWS_GREEN_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v2/
ENTITLEMENT_V2_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v2/
TENANT: opendes
SERVICE_PRINCIPAL_EMAIL: serviceprincipal@testing.com
#Entitlements V2 variables--end--
......@@ -164,10 +164,10 @@ aws-update-ecs:
stage: deploy
needs: ['aws-containerize']
script:
- ECS_SERVICE_NAME=$(aws ssm get-parameter --name /osdu/${RESOURCE_PREFIX}/ecs/services/${SERVICE_NAME} --query Parameter.Value --output text --region $AWS_GREEN_REGION)
- ECS_SERVICE_NAME=$(aws ssm get-parameter --name /osdu/${RESOURCE_PREFIX}/ecs/services/${SERVICE_NAME} --query Parameter.Value --output text --region $AWS_BLUE_REGION)
#limit output to the first 50 lines...the rest is bloat
- export ECS_UPDATE_TMP_FILE=/tmp/ecs-update-log-${RANDOM}.txt
- aws ecs update-service --cluster $AWS_CLUSTER_NAME --service $ECS_SERVICE_NAME --region $AWS_GREEN_REGION --force-new-deployment > $ECS_UPDATE_TMP_FILE
- aws ecs update-service --cluster $AWS_CLUSTER_NAME --service $ECS_SERVICE_NAME --region $AWS_BLUE_REGION --force-new-deployment > $ECS_UPDATE_TMP_FILE
- cat $ECS_UPDATE_TMP_FILE | head -n 50
only:
variables:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment