Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark for deployment tags #190

Merged
merged 4 commits into from
Feb 2, 2016
Merged

Mark for deployment tags #190

merged 4 commits into from
Feb 2, 2016

Conversation

nhandler
Copy link
Contributor

In an effort to migrate us from branches to tags, this first pull request updates mark_for_deployment to tag as well as create a branch. Since branches are still being created like normal and no other code has been updated to switch from branches to tags, this should be a safe change.

The change to CHAGNELOG.md was to make the pre-commit hook happy.

@nhandler nhandler self-assigned this Jan 27, 2016
@mjksmith mjksmith force-pushed the master branch 2 times, most recently from 8bbb271 to 42ae5c2 Compare January 27, 2016 03:19
@Rob-Johnson
Copy link
Contributor

lg2m. ship

@@ -975,6 +975,10 @@ def get_paasta_branch(cluster, instance):
return 'paasta-%s.%s' % (cluster, instance)


def get_paasta_tag(cluster, instance):
return get_paasta_branch(cluster, instance)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a good start, long term I think we need the type of tag that start/stop does with a timestamp. Otherwise we are moving this same tag over and over which is kinda gross.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 do this before you ship this branch

@solarkennedy
Copy link
Contributor

You are going to have to rebase on top of @mjksmith's deploy_group changes carefully.

@nhandler nhandler force-pushed the mark_for_deployment-tags branch from 29ccd85 to 71adfd6 Compare February 1, 2016 21:44
@solarkennedy
Copy link
Contributor

ship

nhandler added a commit that referenced this pull request Feb 2, 2016
@nhandler nhandler merged commit b2f70f4 into master Feb 2, 2016
@nhandler nhandler deleted the mark_for_deployment-tags branch February 2, 2016 01:25
@nhandler nhandler removed the in review label Feb 2, 2016
nhandler added a commit that referenced this pull request Feb 3, 2016
This reverts commit b2f70f4, reversing
changes made to a02373d.

Conflicts:
	paasta_tools/cli/cmds/start_stop_restart.py
nhandler added a commit that referenced this pull request Feb 3, 2016
Revert "Merge pull request #190 from Yelp/mark_for_deployment-tags"
@nhandler nhandler restored the mark_for_deployment-tags branch February 4, 2016 18:58
@nhandler nhandler deleted the mark_for_deployment-tags branch February 4, 2016 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants