Closed Bug 835363 Opened 11 years ago Closed 11 years ago

[basket] Push basket master branch to stage and prod.

Categories

(Infrastructure & Operations Graveyard :: WebOps: Other, task)

Product:
Infrastructure & Operations Graveyard
Component:
WebOps: Other
Type:
task
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: pmac, Assigned: cturra)

References

Details

(Whiteboard: [triaged 20130128][push interrupt]) 

+++ This bug was initially created as a clone of Bug #833896 +++

This is a minor change to a debug function in basket which is confirmed working in dev. Please push to both stage and master.
No longer blocks: 826292
:pmac - push to stage complete. let me know when you have had a chance to test and it's good to go into prod.

[root@genericadm.private.phx1 basket.allizom.org]# bash -x update 
+ CODE_DIR=/data/genericrhel6-stage/src/basket.allizom.org/basket
+ VENDOR_DIR=/data/genericrhel6-stage/src/basket.allizom.org/basket/vendor
+ LOCALE_DIR=/data/genericrhel6-stage/src/basket.allizom.org/basket/locale
+ date
Mon Jan 28 11:37:03 PST 2013
+ echo -e 'Updating code...'
Updating code...
+ cd /data/genericrhel6-stage/src/basket.allizom.org/basket
+ git fetch origin -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ git checkout -f origin/master -q
+ git submodule sync -q
+ git submodule update --init -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ git log -3
commit 18ac9792b06215d83ee66317ead59be102a61b4e
Merge: 39f05a7 cce88f0
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Mon Jan 28 06:26:16 2013 -0800

    Merge pull request #13 from pmclanahan/add-more-to-debug-user
    
    Add data from basket DB to debug-user method.

commit cce88f077cdbc53a772359370d5c8d3af746a866
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Fri Jan 25 15:16:32 2013 -0500

    Add data from basket DB to debug-user method.
    
    This will be useful when we have bugs (like bug 831469)
    that result from token mismatch between ExactTarget and
    basket.

commit 39f05a7339293b6e760913152cf0b05f65ee4740
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Wed Jan 23 13:46:52 2013 -0500

    Bug 826292: Add Firefox OS newsletter.
+ echo -e 'Updating vendor...'
Updating vendor...
+ cd /data/genericrhel6-stage/src/basket.allizom.org/basket/vendor
+ git submodule sync -q
+ git submodule update --init -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ cd /data/genericrhel6-stage/src/basket.allizom.org/basket
+ find . -type f -name .gitignore -or -name '*.pyc' -delete
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ cd /data/genericrhel6-stage/src/basket.allizom.org/basket
+ touch wsgi/basket.wsgi
+ echo -e 'Deploying code...'
Deploying code...
+ '[' xterm == dumb ']'
+ /data/genericrhel6-stage/deploy basket.allizom.org
[2013-01-28 11:37:06] Running rsync_project
[2013-01-28 11:37:06] [localhost] running: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --delete /data/genericrhel6-stage/src/basket.allizom.org/ /data/genericrhel6-stage/www/basket.allizom.org/
[2013-01-28 11:37:08] [localhost] finished: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --delete /data/genericrhel6-stage/src/basket.allizom.org/ /data/genericrhel6-stage/www/basket.allizom.org/ (1.676s)
[2013-01-28 11:37:08] Finished rsync_project (1.677s)
[2013-01-28 11:37:08] Running commit_www
[2013-01-28 11:37:08] [localhost] running: cd /data/genericrhel6-stage/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['basket.allizom.org']'
[2013-01-28 11:37:46] [localhost] finished: cd /data/genericrhel6-stage/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['basket.allizom.org']' (38.443s)
[localhost] out: [master c6348ea] deploy [basket.allizom.org]
[localhost] out: 3 files changed, 62 insertions(+), 4 deletions(-)
[2013-01-28 11:37:46] Finished commit_www (38.444s)
Assignee: server-ops-webops → cturra
Status: NEW → ASSIGNED
Whiteboard: [triaged 20130128][push interrupt]
Working great. Go for prod.
:pmac - push to prod complete.


[root@genericadm.private.phx1 basket.mozilla.org]# bash -x update 
+ CODE_DIR=/data/genericrhel6/src/basket.mozilla.org/basket
+ VENDOR_DIR=/data/genericrhel6/src/basket.mozilla.org/basket/vendor
+ LOCALE_DIR=/data/genericrhel6/src/basket.mozilla.org/basket/locale
+ date
Mon Jan 28 16:35:31 PST 2013
+ echo -e 'Updating code...'
Updating code...
+ cd /data/genericrhel6/src/basket.mozilla.org/basket
+ git fetch origin -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ git checkout -f origin/master -q
+ git submodule sync -q
+ git submodule update --init -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ git log -3
commit 18ac9792b06215d83ee66317ead59be102a61b4e
Merge: 39f05a7 cce88f0
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Mon Jan 28 06:26:16 2013 -0800

    Merge pull request #13 from pmclanahan/add-more-to-debug-user
    
    Add data from basket DB to debug-user method.

commit cce88f077cdbc53a772359370d5c8d3af746a866
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Fri Jan 25 15:16:32 2013 -0500

    Add data from basket DB to debug-user method.
    
    This will be useful when we have bugs (like bug 831469)
    that result from token mismatch between ExactTarget and
    basket.

commit 39f05a7339293b6e760913152cf0b05f65ee4740
Author: Paul McLanahan <paul@mclanahan.net>
Date:   Wed Jan 23 13:46:52 2013 -0500

    Bug 826292: Add Firefox OS newsletter.
+ echo -e 'Updating vendor...'
Updating vendor...
+ cd /data/genericrhel6/src/basket.mozilla.org/basket/vendor
+ git submodule sync -q
+ git submodule update --init -q
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ cd /data/genericrhel6/src/basket.mozilla.org/basket
+ find . -type f -name .gitignore -or -name '*.pyc' -delete
+ checkretval
+ retval=0
+ [[ 0 -gt 0 ]]
+ cd /data/genericrhel6/src/basket.mozilla.org/basket
+ touch wsgi/basket.wsgi
+ echo -e 'Deploying code...'
Deploying code...
+ '[' xterm == dumb ']'
+ /data/genericrhel6/deploy basket.mozilla.org
[2013-01-28 16:35:35] Running rsync_project
[2013-01-28 16:35:35] [localhost] running: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/basket.mozilla.org/ /data/genericrhel6/www/basket.mozilla.org/
[2013-01-28 16:35:36] [localhost] finished: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/basket.mozilla.org/ /data/genericrhel6/www/basket.mozilla.org/ (1.458s)
[2013-01-28 16:35:36] Finished rsync_project (1.475s)
[2013-01-28 16:35:36] Running commit_www
[2013-01-28 16:35:36] [localhost] running: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['basket.mozilla.org']'
[2013-01-28 16:35:51] [localhost] finished: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['basket.mozilla.org']' (15.015s)
[localhost] out: [master bf8eebe] deploy [basket.mozilla.org]
[localhost] out: 3 files changed, 62 insertions(+), 4 deletions(-)
[2013-01-28 16:35:51] Finished commit_www (15.015s)
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Something didn't work. I'm still seeing the old style results from prod. Stage is working great. Very confusing.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
as discussed on irc, i re-touched the wsgi file on all the web heads and everything started working as expected. the deploy script must have failed on that and i missed it.
Status: REOPENED → RESOLVED
Closed: 11 years ago → 11 years ago
Resolution: --- → FIXED
Component: Server Operations: Web Operations → WebOps: Other
Product: mozilla.org → Infrastructure & Operations
Product: Infrastructure & Operations → Infrastructure & Operations Graveyard
You need to log in before you can comment on or make changes to this bug.