Skip to content

Instantly share code, notes, and snippets.

@micktwomey
Created December 18, 2014 13:40
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save micktwomey/19fa841a2f9982db8522 to your computer and use it in GitHub Desktop.
Save micktwomey/19fa841a2f9982db8522 to your computer and use it in GitHub Desktop.
deploy_runner diffs between 2293-a and 2295-a on PROD vs QA
diff -uNr deploy_runner-previous/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py deploy_runner-current/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py
--- deploy_runner-previous/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py 2014-12-18 03:24:33.590846902 +0000
+++ deploy_runner-current/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py 2014-12-18 12:48:42.000000000 +0000
@@ -115,7 +115,7 @@
self.hosts = self.servers.get(hs_env) or ()
elif 'servers' in kwargs:
self.servers = self._parse_servers(kwargs.get('servers', {}))
- self.hosts = self.servers.get(hs_env) or self.servers.get(hs_env.upper()) or ()
+ self.hosts = self.servers.get(hs_env) or ()
self.hipchat_room_id_to_notify = kwargs.get('hipchat_room_id_to_notify') or kwargs.get('hipchatRoomId')
self.hipchat = kwargs.get('hipchat', [])
@@ -257,16 +257,18 @@
@staticmethod
def from_json(hs_env, build, rev, project_json, deploy_user=None, raw_config=None):
+ hs_env = hs_env.lower()
+
project_type = project_json.get('type')
# if deploying to mesos.*, override project type to mesos
if not isinstance(project_json.get('servers'), list):
- if (project_json.get('type', 'procfile') == 'procfile' and hs_env.upper() not in project_json.get('servers', {})) or any([isinstance(host, dict) or host.startswith('mesos.') or host == 'mesos' for host in project_json.get('servers', {}).get(hs_env.upper(), [])]):
+ if (project_json.get('type', 'procfile') == 'procfile' and hs_env not in project_json.get('servers', {})) or any([isinstance(host, dict) or host.startswith('mesos.') or host == 'mesos' for host in project_json.get('servers', {}).get(hs_env, [])]):
project_type = 'mesos'
if 'servers' not in project_json:
project_json['servers'] = {}
- if hs_env.upper() not in project_json['servers']:
- project_json['servers'][hs_env.upper()] = ['mesos']
+ if hs_env not in project_json['servers']:
+ project_json['servers'][hs_env] = ['mesos']
if project_type == 'meta' and project_json.get('mesosApiVersion', {}).get(hs_env) == 'v2':
project_type = 'mesos-meta'
diff -uNr deploy_runner-previous/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py deploy_runner-current/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py
--- deploy_runner-previous/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py 2014-12-16 11:18:03.000000000 +0000
+++ deploy_runner-current/app/.deploy_virtualenv/lib/python2.6/site-packages/fabric_deploy/project/base.py 2014-12-18 12:48:42.000000000 +0000
@@ -257,6 +257,8 @@
@staticmethod
def from_json(hs_env, build, rev, project_json, deploy_user=None, raw_config=None):
+ hs_env = hs_env.lower()
+
project_type = project_json.get('type')
# if deploying to mesos.*, override project type to mesos
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment