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

Fix bug 1135693: Add update scripts to repo. #2767

Merged

Conversation

pmclanahan
Copy link
Contributor

Moves the scripts run by cron to this repo. Also included is the script to update product-details, but I believe we have to alter chief to have it be the one that is run, or at least symlink to this one from the original path.

@pmclanahan
Copy link
Contributor Author

@jgmize r?

I also took the liberty of cleaning up some of the code and fixing issues with the dev autoupdate script.

@pmclanahan
Copy link
Contributor Author

Specific chief alterations required after this merges:

  • Change shell script called in /data/bedrock/src/www.mozilla.org-django/product-details-push.py to bin/update-scripts/prod/update-prod-product-details.sh in this repo.
  • Remove the following from the commander script above: ctx.remote(settings.REMOTE_UPDATE_SCRIPT). The shell script already deploys the changes.

Also on that last point I believe that calling that REMOTE_UPDATE_SCRIPT syncs all changes in the WWW dir on the admin node to production. This assumes that the WWW dir is always in a good state, but that assumption is not safe.

@pmclanahan
Copy link
Contributor Author

@superawesome you may have opinions on this one as well.

@pmclanahan
Copy link
Contributor Author

I'mma split out the part of this that will fix dev autoupdating. Don't merge this until that one is merged and this is rebased.

@pmclanahan
Copy link
Contributor Author

@jgmize rebased and updated.

@jgmize
Copy link
Contributor

jgmize commented Mar 4, 2015

@pmclanahan this lgtm, but I'd feel better if @superawesome would take a look as well before we merge this one.

@pmclanahan
Copy link
Contributor Author

@jgmize I went ahead and moved the chief deploy script for product-details in here. We'd just need to symlink to this one from the old one like we've done for all of the rest of the chief commander scripts.

pmac added 2 commits March 6, 2015 16:18
After this merges we'll only need to symlink the
old p-d deployment script to this one, like the
rest of the chief scripts are.
@pmclanahan pmclanahan force-pushed the move-update-scripts-to-repo-1135693 branch from a16eb8d to 908c52c Compare March 6, 2015 21:18
@jgmize
Copy link
Contributor

jgmize commented Mar 6, 2015

Thanks @pmclanahan. @superawesome if this looks good to you I'd like to merge this, and then would you mind making the appropriate puppet changes after we push this to prod?

@jgmize
Copy link
Contributor

jgmize commented Mar 8, 2015

Based on https://bugzilla.mozilla.org/show_bug.cgi?id=1135693#c4 I think we're good to go :)

jgmize added a commit that referenced this pull request Mar 8, 2015
…1135693

Fix bug 1135693: Add update scripts to repo.
@jgmize jgmize merged commit 0bd2c30 into mozilla:master Mar 8, 2015
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.

3 participants