#amara

ehazlett: so how do you feel about merging the gh-920+gh-997 branches and deploying?

janet seemed to think they were okay

I guess test on staging first before production deploy since janet mentioned issues with the demo instance

ehazlett: you around?

bendk1: yeah sorry

np

what do you think about that plan above?

yeah that should work

okay, I'll merge and push

ehazlett: okay merged

bendk1: thx

did you figure out that issue running the migrations?

bendk1: no

it's with teams

I thought maybe specifying the particular apps could work

i was going to look at it this morning

Project unisubs-staging build #2122: STILL FAILING in 1 min 0 sec: http://dev.universalsubtitles.org:8888/job/unis...

* ben: Added setting to notify teams of new videos hourly (#997)

* jed: add webdriver tests for message sending

* jed: make sure 1 email per member for each set of videos added

* ben: Adding missing migration

* ben: Added command to run a bash shell in the docker dev environment

* ben: Fix thumbnail uploads (#920)

* ben: Removed the thumb_options paramater from S3EnabledImageField.

* ben: Fixed the amara-dev Dockerfile.

* ben: Removed references to the sorl-thumbnail's template tags

the migrations worked for me, and that's the one relevant difference I can think of

bendk1: did you just run "migrate" or each individually

yeah, so migrate teams, migrate videos, and migrate auth

I think those are the 3 that need migrations

then you can try migrate without any arguments, it shouldn't do anything

bendk1: still getting TypeError: __init__() got an unexpected keyword argument 'thumb_options' on migrate teams

ehazlett: hmm, can I drive?

bendk1: yep -- it's the 9f1b6abf4cf9 container on ec2-54-224-109-115.compute-1.amazonaws.com

ehazlett: ahh, so I see what's going on... both 997 and 920 had migrations, but 997's didn't run with the code in 920

ah

we could rebase to make sure everything runs correctly, but I think the simplest solutinon is to check out the revision before HEAD, run migrate, then checkout HEAD and run migrate again

ehazlett: this page that we're using to demo with seems to be down: http://gh-855.amara.org/en/embedder-offsite/ — not super urgent but can you ping me when it's back?

nicholasreville: yeah looks like that container was removed

something like this:

git checkout ef62a3df9dffa81bdcd6609a64588ea02d1bbe81

python manage.py migrate

git checkout git log origin/staging

commit c6919adbc329614fa3db9f0bea4a02a3d6a414b0

python manage.py migrate

bendk1: did we merge 855? // nicholasreville

ehazlett: I don't think so

hmm ok

ehazlett: nope

nicholasreville: i'll create a new one

ehazlett: for some reason, I had to run git fetch in the middle of those 2 checkouts in order to pull in the latest revision on staging

bendk1: ok cool

ehazlett: maybe we can redirect that url to something more permanent?

nicholasreville: yeah i'm not sure what happened to that container

nicholasreville: added some comments about the transcript viewer and SEO

not sure what you think about that one

nicholasreville: the gh-855 should be back

bendk1: so we're good to deploy to staging?

(it's been merged)?

ehazlett: nicholasreville: so it looks like that bug was fixed, but after uploading my picture I'm just seeing "Saving..." and nothing happening

I think this might be the same S3 upload issue again

so the crash is fixed, but the feature is still not really working

let me take a quick look at it and see what I can figure out

if I can't understand it, we might as well merge since 997 is fixed

ok

ehazlett: so I think something is strange with staging

bendk1: what's up?

the first thing I tried to do was attach to 9f1b6abf4cf9, then manually upload my profile pic

that seems to work great, but when I look at it on the website I don't see it

also, I'm seeing sentry errors that should have been fixed with the new version

there's no way we should be going through the sorl thumbnail code anymore, it shouldn't be there

maybe there's still an old container serving up webfiles?

bendk1: it shouldn't -- that container is standalone and is even using a separate database

I see several amara-staging containers on manage.amara.org

ohh, 9f1b6a is using a separate database?

ahh, that's gh-920

okay, I get it

so we need to deploy the changes to staging

ehazlett: ^^

gotcha

yeah i wasn't sure about the migrations and didn't want to mess staging up -- so i created a separate db with it

sorry!

bendk1: so we're good to deploy to staging then?

ahh, I see I thought you were talking about production

yes we're good to deploy staging

ok cool

ehazlett: tell me once it's deployed so I can test

bendk1: this will take a min -- i'm rebuilding the image

ok

no problem

bendk1: staging deployed

ehazlett: staging is timing out for me

bendk1: resolves instant for me

bendk1: http://staging.amara.org/en/

bendk1: a certain url?

weird

it works in curl, but not chrome

works in ff too

hmm

i was using chrome

I think it might be the fact that I'm logged in

yeah, after logging in it fails on ff as well

I think the revision is wrong somehow

ehazlett: or maybe the migrations didn't run

ehazlett: ^^

hmm

bendk1: checking one min

bendk1: yeah getting the same migration error

how did you fix the gh-920 ?

you have to back up to a previous revision

ah

(10:35:19 AM) bendk1: git checkout ef62a3df9dffa81bdcd6609a64588ea02d1bbe81

(10:35:19 AM) bendk1: python manage.py migrate

(10:35:19 AM) bendk1: git checkout git log origin/staging

(10:35:19 AM) bendk1: commit c6919adbc329614fa3db9f0bea4a02a3d6a414b0

(10:35:19 AM) bendk1: python manage.py migrate

ah sorry -- didn't see that earlier :(

bendk1: ok migrated -- i'm able to login as well

sorry about that

and profile thumbnail uploading is working

I think we can deploy to production

thanks ehazlett

you'll need to run through those hoops again for production

Ok

Yw

okay, I'm going to take lunch, if there are any issues deploying production, call me on my cell

and if it works, send nicholasreville a message

thanks!

ehazlett: do we have a new URL for that URL that went down? (and it should redirect)

its the same one

for gh-855 right?

ah yeah

it is working now

i'll work with ben to find a more permanent place soon

thx

Ok

ehazlett: this looks like it's showing an older version of the transcript viewer - http://gh-855.amara.org/en/embedder-offsite/

like it rolled back after it went down

ehazlett: i think yes, merging would be good

ok

i'll merge in staging (or try) :)