From 0933c153ea928100a371420baa0d40ae651f1031 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 4 Jul 2016 16:17:07 +0100 Subject: [PATCH 01/16] Added notify-app if/else block so can run on new staging and preview --- scripts/aws_change_ownership.sh | 15 ++++++++++++--- scripts/aws_install_dependencies.sh | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/aws_change_ownership.sh b/scripts/aws_change_ownership.sh index 411d380b1..8b565625a 100755 --- a/scripts/aws_change_ownership.sh +++ b/scripts/aws_change_ownership.sh @@ -1,5 +1,14 @@ #!/bin/bash -echo "Chown application to be owned by ubuntu" -cd /home/ubuntu/; -chown -R ubuntu:ubuntu notifications-api + +if [ -e "/home/notify-app" ] +then + echo "Chown application to be owned by notify-app" + cd /home/notify-app/; + chown -R notify-app:govuk-notify-applications notifications-api +fi +else + echo "Chown application to be owned by ubuntu" + cd /home/ubuntu/; + chown -R ubuntu:ubuntu notifications-api +fi \ No newline at end of file diff --git a/scripts/aws_install_dependencies.sh b/scripts/aws_install_dependencies.sh index c080296ee..b02049c88 100755 --- a/scripts/aws_install_dependencies.sh +++ b/scripts/aws_install_dependencies.sh @@ -1,4 +1,16 @@ echo "Install dependencies" -cd /home/ubuntu/notifications-api; -pip3 install -r /home/ubuntu/notifications-api/requirements.txt -python3 db.py db upgrade + + +if [ -e "/home/notify-app" ] +then + echo "Depenencies for notify-app" + cd /home/ubuntu/notifications-api; + pip3 install -r /home/notify-app/notifications-api/requirements.txt + python3 db.py db upgrade +fi +else + echo "Depenencies for ubuntu" + cd /home/ubuntu/notifications-api; + pip3 install -r /home/ubuntu/notifications-api/requirements.txt + python3 db.py db upgrade +fi \ No newline at end of file From 26890c6436c298aa0dd825ee710395270d534736 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 4 Jul 2016 16:21:51 +0100 Subject: [PATCH 02/16] Added basic elb/instance lookups --- scripts/common_functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 9d898a2fb..591dfa0d1 100644 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -371,7 +371,9 @@ get_elb_name_for_instance_name() { local instance_name=$1 declare -A elb_to_instance_mapping - + + elb_to_instance_mapping['notify_api']='notify-api-elb' + elb_to_instance_mapping['notify_admin_api']='notify-admin-api-elb' elb_to_instance_mapping['live_notify_api']='live-notify-api-elb' elb_to_instance_mapping['staging_notify_api']='staging-notify-api-elb' elb_to_instance_mapping['NotifyApi']='notify-api-elb' From 0bfed1baad0387413709e63da5f3151ebd1a380d Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 4 Jul 2016 16:54:03 +0100 Subject: [PATCH 03/16] Fixing up configs --- appspec.yml | 2 +- aws_run_celery.py | 11 ----------- config.py | 13 +++++++++++-- config_live.py | 30 ------------------------------ config_staging.py | 26 -------------------------- wsgi.py | 11 ----------- 6 files changed, 12 insertions(+), 81 deletions(-) delete mode 100644 config_live.py delete mode 100644 config_staging.py diff --git a/appspec.yml b/appspec.yml index e3c0e5318..a80d5227b 100644 --- a/appspec.yml +++ b/appspec.yml @@ -1,7 +1,7 @@ --- files: - - destination: /home/ubuntu/notifications-api + destination: /home/notify-app/notifications-api source: / hooks: AfterInstall: diff --git a/aws_run_celery.py b/aws_run_celery.py index d5a58a09f..1165af098 100644 --- a/aws_run_celery.py +++ b/aws_run_celery.py @@ -3,19 +3,8 @@ from app import notify_celery, create_app from credstash import getAllSecrets import os -default_env_file = '/home/ubuntu/environment' -environment = 'live' - -if os.path.isfile(default_env_file): - with open(default_env_file, 'r') as environment_file: - environment = environment_file.readline().strip() - # on aws get secrets and export to env os.environ.update(getAllSecrets(region="eu-west-1")) -from config import configs - -os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment] - application = create_app() application.app_context().push() diff --git a/config.py b/config.py index 233de370e..5f9de8349 100644 --- a/config.py +++ b/config.py @@ -126,10 +126,19 @@ class Test(Development): CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' +class Staging(Config): + CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' + + +class Live(Config): + CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' + STATSD_ENABLED = True + + configs = { 'development': 'config.Development', 'test': 'config.Test', - 'live': 'config_live.Live', - 'staging': 'config_staging.Staging', + 'live': 'config.Live', + 'staging': 'config.Staging', 'preview': 'config.Preview' } diff --git a/config_live.py b/config_live.py deleted file mode 100644 index 932db1e77..000000000 --- a/config_live.py +++ /dev/null @@ -1,30 +0,0 @@ -import os -from config import Config - - -class Live(Config): - ADMIN_BASE_URL = os.environ['LIVE_ADMIN_BASE_URL'] - API_HOST_NAME = os.environ['LIVE_API_HOST_NAME'] - ADMIN_CLIENT_SECRET = os.environ['LIVE_ADMIN_CLIENT_SECRET'] - DANGEROUS_SALT = os.environ['LIVE_DANGEROUS_SALT'] - NOTIFICATION_QUEUE_PREFIX = os.environ['LIVE_NOTIFICATION_QUEUE_PREFIX'] - NOTIFY_JOB_QUEUE = os.environ['LIVE_NOTIFY_JOB_QUEUE'] - SECRET_KEY = os.environ['LIVE_SECRET_KEY'] - SQLALCHEMY_DATABASE_URI = os.environ['LIVE_SQLALCHEMY_DATABASE_URI'] - VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['LIVE_VERIFY_CODE_FROM_EMAIL_ADDRESS'] - NOTIFY_EMAIL_DOMAIN = os.environ['LIVE_NOTIFY_EMAIL_DOMAIN'] - FIRETEXT_API_KEY = os.getenv("LIVE_FIRETEXT_API_KEY") - MMG_API_KEY = os.environ['LIVE_MMG_API_KEY'] - CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' - STATSD_ENABLED = True - STATSD_HOST = os.getenv('LIVE_STATSD_HOST') - STATSD_PORT = os.getenv('LIVE_STATSD_PORT') - STATSD_PREFIX = os.getenv('LIVE_STATSD_PREFIX') - FROM_NUMBER = os.getenv('LIVE_FROM_NUMBER') - - BROKER_TRANSPORT_OPTIONS = { - 'region': 'eu-west-1', - 'polling_interval': 1, # 1 second - 'visibility_timeout': 14410, # 60 seconds - 'queue_name_prefix': os.environ['LIVE_NOTIFICATION_QUEUE_PREFIX'] + '-' - } diff --git a/config_staging.py b/config_staging.py deleted file mode 100644 index 20bc762d6..000000000 --- a/config_staging.py +++ /dev/null @@ -1,26 +0,0 @@ -import os -from config import Config - - -class Staging(Config): - ADMIN_BASE_URL = os.environ['STAGING_ADMIN_BASE_URL'] - API_HOST_NAME = os.environ['STAGING_API_HOST_NAME'] - ADMIN_CLIENT_SECRET = os.environ['STAGING_ADMIN_CLIENT_SECRET'] - DANGEROUS_SALT = os.environ['STAGING_DANGEROUS_SALT'] - NOTIFICATION_QUEUE_PREFIX = os.environ['STAGING_NOTIFICATION_QUEUE_PREFIX'] - NOTIFY_JOB_QUEUE = os.environ['STAGING_NOTIFY_JOB_QUEUE'] - SECRET_KEY = os.environ['STAGING_SECRET_KEY'] - SQLALCHEMY_DATABASE_URI = os.environ['STAGING_SQLALCHEMY_DATABASE_URI'] - VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['STAGING_VERIFY_CODE_FROM_EMAIL_ADDRESS'] - NOTIFY_EMAIL_DOMAIN = os.environ['STAGING_NOTIFY_EMAIL_DOMAIN'] - FIRETEXT_API_KEY = os.getenv("STAGING_FIRETEXT_API_KEY") - MMG_API_KEY = os.environ['STAGING_MMG_API_KEY'] - CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' - FROM_NUMBER = os.getenv('STAGING_FROM_NUMBER') - - BROKER_TRANSPORT_OPTIONS = { - 'region': 'eu-west-1', - 'polling_interval': 1, # 1 second - 'visibility_timeout': 14410, # 60 seconds - 'queue_name_prefix': os.environ['STAGING_NOTIFICATION_QUEUE_PREFIX'] + '-' - } diff --git a/wsgi.py b/wsgi.py index 52e95994c..e78f4c136 100644 --- a/wsgi.py +++ b/wsgi.py @@ -4,20 +4,9 @@ from app import create_app from credstash import getAllSecrets -default_env_file = '/home/ubuntu/environment' -environment = 'live' - -if os.path.isfile(default_env_file): - with open(default_env_file, 'r') as environment_file: - environment = environment_file.readline().strip() - # on aws get secrets and export to env os.environ.update(getAllSecrets(region="eu-west-1")) -from config import configs - -os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment] - application = create_app() if __name__ == "__main__": From d34ae9edbc941a3f6f3dc2cf9abe2d69e565c56b Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 4 Jul 2016 16:57:35 +0100 Subject: [PATCH 04/16] Fixed some bash if blocks and removed env file from db.py --- db.py | 11 ----------- scripts/aws_change_ownership.sh | 1 - scripts/aws_install_dependencies.sh | 1 - 3 files changed, 13 deletions(-) diff --git a/db.py b/db.py index d923c8c75..7ded5ba1e 100644 --- a/db.py +++ b/db.py @@ -4,20 +4,9 @@ from app import create_app, db from credstash import getAllSecrets import os -default_env_file = '/home/ubuntu/environment' -environment = 'live' - -if os.path.isfile(default_env_file): - with open(default_env_file, 'r') as environment_file: - environment = environment_file.readline().strip() - # on aws get secrets and export to env os.environ.update(getAllSecrets(region="eu-west-1")) -from config import configs - -os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment] - application = create_app() manager = Manager(application) diff --git a/scripts/aws_change_ownership.sh b/scripts/aws_change_ownership.sh index 8b565625a..09d3d80cf 100755 --- a/scripts/aws_change_ownership.sh +++ b/scripts/aws_change_ownership.sh @@ -6,7 +6,6 @@ then echo "Chown application to be owned by notify-app" cd /home/notify-app/; chown -R notify-app:govuk-notify-applications notifications-api -fi else echo "Chown application to be owned by ubuntu" cd /home/ubuntu/; diff --git a/scripts/aws_install_dependencies.sh b/scripts/aws_install_dependencies.sh index b02049c88..f57f843d7 100755 --- a/scripts/aws_install_dependencies.sh +++ b/scripts/aws_install_dependencies.sh @@ -7,7 +7,6 @@ then cd /home/ubuntu/notifications-api; pip3 install -r /home/notify-app/notifications-api/requirements.txt python3 db.py db upgrade -fi else echo "Depenencies for ubuntu" cd /home/ubuntu/notifications-api; From 7bd1ea1a455922f28024d1acbb7d4af110ba941b Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 4 Jul 2016 17:06:05 +0100 Subject: [PATCH 05/16] Wrong path to app --- scripts/aws_install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/aws_install_dependencies.sh b/scripts/aws_install_dependencies.sh index f57f843d7..f7cb975f6 100755 --- a/scripts/aws_install_dependencies.sh +++ b/scripts/aws_install_dependencies.sh @@ -4,7 +4,7 @@ echo "Install dependencies" if [ -e "/home/notify-app" ] then echo "Depenencies for notify-app" - cd /home/ubuntu/notifications-api; + cd /home/notify-app/notifications-api; pip3 install -r /home/notify-app/notifications-api/requirements.txt python3 db.py db upgrade else From 9ec52eac02272f75f3431788fcb6fe16223252d6 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 15:38:20 +0100 Subject: [PATCH 06/16] New config style --- app/__init__.py | 4 +++- config.py | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index fad8bd3e5..a83405bce 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,6 +16,8 @@ from app.clients.sms.loadtesting import LoadtestingClient from app.clients.email.aws_ses import AwsSesClient from app.clients.statsd.statsd_client import StatsdClient from app.encryption import Encryption +from config import configs + DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f" DATE_FORMAT = "%Y-%m-%d" @@ -38,7 +40,7 @@ api_user = LocalProxy(lambda: _request_ctx_stack.top.api_user) def create_app(app_name=None): application = Flask(__name__) - application.config.from_object(os.environ['NOTIFY_API_ENVIRONMENT']) + application.config.from_object(configs[os.environ['NOTIFY_ENVIRONMENT']]) if app_name: application.config['NOTIFY_APP_NAME'] = app_name diff --git a/config.py b/config.py index 5f9de8349..4231a3b40 100644 --- a/config.py +++ b/config.py @@ -136,9 +136,9 @@ class Live(Config): configs = { - 'development': 'config.Development', - 'test': 'config.Test', - 'live': 'config.Live', - 'staging': 'config.Staging', - 'preview': 'config.Preview' + 'development': Development, + 'test': Test, + 'live': Live, + 'staging': Staging, + 'preview': Preview } From 44dffc9d22ea62e688aede0c2e8d3d85d49a4ccb Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 15:58:13 +0100 Subject: [PATCH 07/16] Fixed config so properties are shared if possible --- app/version.py | 6 +++--- config.py | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/version.py b/app/version.py index 1defd614d..d6d5d6781 100644 --- a/app/version.py +++ b/app/version.py @@ -1,3 +1,3 @@ -__travis_commit__ = "dev" -__time__ = "dev" -__travis_job_number__ = "dev" +__travis_commit__ = "" +__time__ = "2016-07-05:15:38:37" +__travis_job_number__ = "" diff --git a/config.py b/config.py index 4231a3b40..e0e6436c1 100644 --- a/config.py +++ b/config.py @@ -92,6 +92,8 @@ class Config(object): Queue('retry', Exchange('default'), routing_key='retry'), Queue('email-already-registered', Exchange('default'), routing_key='email-already-registered') ] + API_HOST_NAME = os.environ['API_HOST_NAME'] + MMG_API_KEY = os.environ['MMG_API_KEY'] FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") LOADTESTING_NUMBER = os.getenv('LOADTESTING_NUMBER') LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY") @@ -109,20 +111,14 @@ class Config(object): class Development(Config): DEBUG = True - API_HOST_NAME = os.environ['API_HOST_NAME'] - MMG_API_KEY = os.environ['MMG_API_KEY'] CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' class Preview(Config): - MMG_API_KEY = os.environ['MMG_API_KEY'] - API_HOST_NAME = os.environ['API_HOST_NAME'] CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' class Test(Development): - MMG_API_KEY = os.environ['MMG_API_KEY'] - API_HOST_NAME = os.environ['API_HOST_NAME'] CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' From 5635235269393f784d88705bb488dca450cc4bf5 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 16:07:00 +0100 Subject: [PATCH 08/16] Debugging --- db.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/db.py b/db.py index 7ded5ba1e..b34dbddad 100644 --- a/db.py +++ b/db.py @@ -7,6 +7,16 @@ import os # on aws get secrets and export to env os.environ.update(getAllSecrets(region="eu-west-1")) +print("DOING SETUP") +print("\n" * 10) +print("SECRETS") +print("\n" * 10) +print(getAllSecrets(region="eu-west-1")) +print("\n" * 10) +print("ENV") +print("\n" * 10) +print(os.environ) + application = create_app() manager = Manager(application) From dbe34f46e610f5ba62ccdf47f8fadd1c437c9902 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 16:37:16 +0100 Subject: [PATCH 09/16] Reordered imports --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index a83405bce..2b1a168b7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,6 @@ from app.clients.sms.loadtesting import LoadtestingClient from app.clients.email.aws_ses import AwsSesClient from app.clients.statsd.statsd_client import StatsdClient from app.encryption import Encryption -from config import configs DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f" @@ -40,6 +39,7 @@ api_user = LocalProxy(lambda: _request_ctx_stack.top.api_user) def create_app(app_name=None): application = Flask(__name__) + from config import configs application.config.from_object(configs[os.environ['NOTIFY_ENVIRONMENT']]) if app_name: From e56d513828256e465aa8d05a4a9ff7fd8c6a0751 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 16:53:47 +0100 Subject: [PATCH 10/16] Change staging config --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index e0e6436c1..ca7ab0a9d 100644 --- a/config.py +++ b/config.py @@ -123,7 +123,7 @@ class Test(Development): class Staging(Config): - CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' + CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload' class Live(Config): From 5c7762f9694bd89aa097ecabc1cb37df4ac27e4d Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 5 Jul 2016 21:25:37 +0100 Subject: [PATCH 11/16] Fixed condig to run tests with new style --- config.py | 9 ++++----- environment_test.sh | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config.py b/config.py index ca7ab0a9d..b05319836 100644 --- a/config.py +++ b/config.py @@ -97,7 +97,7 @@ class Config(object): FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") LOADTESTING_NUMBER = os.getenv('LOADTESTING_NUMBER') LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY") - CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload' + CSV_UPLOAD_BUCKET_NAME = os.getenv("CSV_UPLOAD_BUCKET_NAME") NOTIFICATIONS_ALERT = 5 # five mins FROM_NUMBER = os.getenv('FROM_NUMBER') @@ -111,11 +111,10 @@ class Config(object): class Development(Config): DEBUG = True - CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' class Preview(Config): - CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' + CSV_UPLOAD_BUCKET_NAME = os.getenv("CSV_UPLOAD_BUCKET_NAME") class Test(Development): @@ -123,13 +122,13 @@ class Test(Development): class Staging(Config): - CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload' + CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload' class Live(Config): CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' STATSD_ENABLED = True - + configs = { 'development': Development, diff --git a/environment_test.sh b/environment_test.sh index 010810394..d4665632b 100644 --- a/environment_test.sh +++ b/environment_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -export NOTIFY_API_ENVIRONMENT='config.Test' +export NOTIFY_ENVIRONMENT='test' export ADMIN_BASE_URL='http://localhost:6012' export ADMIN_CLIENT_USER_NAME='dev-notify-admin' export ADMIN_CLIENT_SECRET='dev-notify-secret-key' From e606202a0806fd000d01599b53b3397936eede44 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 6 Jul 2016 11:48:22 +0100 Subject: [PATCH 12/16] Increase ELB wait time --- scripts/common_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 591dfa0d1..a2e136b25 100644 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -101,7 +101,7 @@ reset_waiter_timeout() { fi # Base register/deregister action may take up to about 30 seconds - timeout=$((timeout + 30)) + timeout=$((timeout + 60)) WAITER_ATTEMPTS=$((timeout / WAITER_INTERVAL)) } From c6656538598175c42499b58bbe62bf20861470e8 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 29 Jul 2016 10:49:48 +0100 Subject: [PATCH 13/16] Longer timeout on install as fails on staging --- appspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appspec.yml b/appspec.yml index a80d5227b..77f7ed385 100644 --- a/appspec.yml +++ b/appspec.yml @@ -8,7 +8,7 @@ hooks: - location: scripts/aws_install_dependencies.sh runas: root - timeout: 300 + timeout: 1000 - location: scripts/aws_change_ownership.sh runas: root From 0d1732d46dbf00e9aabc5ee27b2b0bbc3d55781c Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 2 Aug 2016 14:29:27 +0100 Subject: [PATCH 14/16] Removed deploy steps from new staging. to be added back once merged to master. --- .travis.yml | 142 +--------------------------------------------------- 1 file changed, 1 insertion(+), 141 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d2a4b2c9..543c13337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: python: - '3.4' addons: - postgresql: '9.3' + postgresql: '9.5' install: - pip install pip-accel - pip-accel install -r requirements_for_test.txt @@ -24,143 +24,3 @@ notifications: slack: rooms: secure: vCmpAjdXkprqGzSnQzcco1lNiFuj/nRQdlVTGSnvg2HEqZUM5vzmWtQYw3WNS/bcgbVxV/nLgza17cdsmFqOuaZll4kDM0swnmk17eynImAHPFF/flGsNcw4oRV7WzWrq7j1TvGzJzxJkHYOjJFk0iMLM7+P76sWHI6Oa5NHQYH2l7a4hqzqmuUKaloHeZX/Ro2RmFE+/t/SfNr0pmtTRO4CfLfPUdUs9D8Mx0cyc1Z9Ke4Cq+R2Lsp8BwH0nye6pb9cI4h1YmUY/Xt8O1Z0QbncHZviWojSB2vV0V5WQPzqjjseAznJ1depK/LPOlRHlqddkEbGK28rDwsxbzY1q3DCZZiZZTXBD80HyNr/J4rfRAXhoCafwR57cqqIQ7G/fb5A/ckUM8TFKqUPh7wvu67OAiSWJmO78C8fumF3HxcoGp7DQOQPFLtWGuCfh2zjI9WbUhiHQwWl9/9qpgMEuXH7LOJAzgQbEp1A7XRmT2GupYEkGdFMwT8ojp8OXds08diEy1FNonWAtFZs8pO92urK862pCRB8WRQZWMjpcnif1Ht4QtwYFO9iVp5ygReTEoFuiQPMAypCVCzKgHe/W8LX55xzSnlUQqDU2NzN37LfC4ctS1h3BfIIU5KP9PmdgkKRUWcrFE3eMXPG36OdU4hRj4FMURzmAOZYhaSXuP8= -deploy: -- provider: s3 - access_key_id: AKIAJQPPNM6P6V53SWKA - secret_access_key: &1 - secure: irusc9JdTbXhKPMYUEHIOPXk7cCCleRsXXW/ZOAEWcHtdtuF6YNACsN3pywwyZ9UU+MqZb8lD3UH77o3u7BtuyPPv5JDy7cB7AoIX6EAaZIdxAS4v2tTpLPh6oS2QtfI1U5giI2g2C5IkRZIIrqiWtT63y0eReL5z5r5x7kEY5U7UOMrIL0w2m/frate0a4Q380ZbjRA1X0PcQ3IeavxQbTEYug+XEaKcpjqIFFwxeNYu814Ox7fMm+bqpG7TuwDF2i1+jAlX3NZSiuUBBYpHqgK6EARnCNwi8Yr2+CBO6ykXY1lcVn13+cSsFXDP7lgkK/BJUewWIrkQ6EL28ntTaG3cpZhSMB2fc21VRNnVzNDfzf9R+bI/Xy45fyraTVZ2Xun8j262SAM+F8D6Ivt1Y+n8aRHN0U8P//Yhfx2TMTFoHLhGUp076FDPKmcWRWpYikMzmTR/oVu6yE5OacntYBp8dE1QGrVSR//rRHK6QkQeDbnp/cSbOiZY92PeYeDjCLbZMrqASONWtzR6V0CPu/++iLw0mODd2xRlpsnFcpF8ygxFtAgOUrKXbAdu9JNdNE1pPE2FMDb6DKAuIxrRQT8ceUwhEChR7UGERTtbr2deyc+4f+MpmUK59uaqdG6y5q0KsiXhUTyzmKVLGxr/dyA5cATtsFDCx8caM0Qx6I= - local_dir: dpl_cd_upload - skip_cleanup: true - region: eu-west-1 - bucket: notifications-api-codedeploy - wait-until-deployed: true - on: - repo: alphagov/notifications-api -- provider: codedeploy - access_key_id: AKIAJQPPNM6P6V53SWKA - secret_access_key: *1 - bucket: notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: notifications_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJQPPNM6P6V53SWKA - secret_access_key: *1 - bucket: notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: notifications_admin_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJQPPNM6P6V53SWKA - secret_access_key: *1 - bucket: notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: notifications_delivery_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: s3 - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: &1 - secure: daC1bCHXqLRK+iIZ8P699KCnTh77lwV4KxrZxL1yd6cstgfptyd/rg1WgRwE6QdxOCT9gQvKWUZFCzFy7M6E/Ih8EUHqEXTzC5M4oAye8rhePIBMQwqkgfYyIoZ3LdDMMP5JfBhiz0zS3Vj7HerL2qIu12adJBjkRJx3XAGimCrFOMQ0xUXQAKDjL6Xmv+gVz2f/ISLy6icKY4KNGt3cQV+8pa5aMF34C9R2udA9N67EWlXlh7hJbFtmY+0Zqpo8Rr6wKRb5MA0xEcTVLORSz1aa6GkxUCbzaIH99p7z3Ghz0qW2bUi9ZcDrvg0GLbVe1T+1HXhfktJfW8wnzw6A/2U/CIIFDQZ/qk0w/DkEwpQinXow99Zl49CcEU+v8llKhg5nM3LmAZCQg1c/iZyP/d90AwAMoMA/VTDD72M93IqTJQH18eC8g02DwE0hNDD6aos5wzeuDeiH/6BG+Tq0pDl0y0aWCcHf3vGRlo/5GlWfpE0vMQEC+qnEOWOUqSprCdSypgD2Aip9mCC98w4BkqKKvGNHPZolA7rxf7E9hTK+BNPRATpYsHR1X/1Xl0TMc/pHhjU1yNXzWnI/kOlNV2CRq3slEtcWihaEo8oDHJ+BhGT49Ps3Je7UB2xO/jXXFPhwJotPMOacTcnUkGqVJSlK1g6TIn4t9nTVSY8KFUs= - local_dir: dpl_cd_upload - skip_cleanup: true - region: eu-west-1 - wait-until-deployed: true - on: &2 - repo: alphagov/notifications-api - branch: staging - bucket: staging-notifications-api-codedeploy -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: staging-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: staging_delivery_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: staging-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: staging_public_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: staging-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: staging_admin_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: s3 - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: &1 - secure: daC1bCHXqLRK+iIZ8P699KCnTh77lwV4KxrZxL1yd6cstgfptyd/rg1WgRwE6QdxOCT9gQvKWUZFCzFy7M6E/Ih8EUHqEXTzC5M4oAye8rhePIBMQwqkgfYyIoZ3LdDMMP5JfBhiz0zS3Vj7HerL2qIu12adJBjkRJx3XAGimCrFOMQ0xUXQAKDjL6Xmv+gVz2f/ISLy6icKY4KNGt3cQV+8pa5aMF34C9R2udA9N67EWlXlh7hJbFtmY+0Zqpo8Rr6wKRb5MA0xEcTVLORSz1aa6GkxUCbzaIH99p7z3Ghz0qW2bUi9ZcDrvg0GLbVe1T+1HXhfktJfW8wnzw6A/2U/CIIFDQZ/qk0w/DkEwpQinXow99Zl49CcEU+v8llKhg5nM3LmAZCQg1c/iZyP/d90AwAMoMA/VTDD72M93IqTJQH18eC8g02DwE0hNDD6aos5wzeuDeiH/6BG+Tq0pDl0y0aWCcHf3vGRlo/5GlWfpE0vMQEC+qnEOWOUqSprCdSypgD2Aip9mCC98w4BkqKKvGNHPZolA7rxf7E9hTK+BNPRATpYsHR1X/1Xl0TMc/pHhjU1yNXzWnI/kOlNV2CRq3slEtcWihaEo8oDHJ+BhGT49Ps3Je7UB2xO/jXXFPhwJotPMOacTcnUkGqVJSlK1g6TIn4t9nTVSY8KFUs= - local_dir: dpl_cd_upload - skip_cleanup: true - region: eu-west-1 - wait-until-deployed: true - on: &2 - repo: alphagov/notifications-api - branch: live - bucket: live-notifications-api-codedeploy -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: live-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: live_delivery_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: live-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: live_public_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -- provider: codedeploy - access_key_id: AKIAJ5MKF6G3P2JQP4QQ - secret_access_key: *1 - bucket: live-notifications-api-codedeploy - key: notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip - bundle_type: zip - application: notifications-api - deployment_group: live_admin_api_deployment_group - region: eu-west-1 - wait-until-deployed: true - on: *2 -before_deploy: -- ./scripts/update_version_file.sh -- zip -r --exclude=*__pycache__* notifications-api * -- mkdir -p dpl_cd_upload -- mv notifications-api.zip dpl_cd_upload/notifications-api-$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.zip From 610d37cf47edbfbd9b988baf6e7994592e96094f Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 2 Aug 2016 14:35:17 +0100 Subject: [PATCH 15/16] latest postgres version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 543c13337..3322e7309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: python: - '3.4' addons: - postgresql: '9.5' + postgresql: '9.4.1' install: - pip install pip-accel - pip-accel install -r requirements_for_test.txt From f939e9220dadcdaec34fab1ccc11dc0fc812f262 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 2 Aug 2016 14:40:56 +0100 Subject: [PATCH 16/16] reverted postgres version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3322e7309..8116cd577 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: python: - '3.4' addons: - postgresql: '9.4.1' + postgresql: '9.3' install: - pip install pip-accel - pip-accel install -r requirements_for_test.txt