search

NAVADMC / ADSM

A simulation of disease spread in livestock populations. Includes detection and containment simulation.
Other
10 stars 5 forks source link

Migration Conflict #901

Closed BryanHurst closed 5 years ago

BryanHurst commented 6 years ago

There is a conflicting migration in the Production branch that will prevent us promoting vaccination rings to beta or production. This needs to be merged/solved.

BryanHurst commented 6 years ago

The issue is with test databases in the CEngine repo. I attempted to step back the offending migration and apply the new migrations in the proper order to the DBs, but this process only half way worked.

DBs created before Dec. 11, 2015 were able to be stepped back properly and migrated forward. DBs created after Dec. 11, 2015 couldn't be stepped back.

All the DB files in module.control_measures failed, plus a handful of the ones in module.ring_vaccination.

Going to hold off on following up on this until we have other release items finished.

BryanHurst commented 6 years ago

@ndh2 will spend a couple of hours to get an estimate on how long recreating the test databases will take.

ndh2 commented 6 years ago

I just spent 90 minutes and recreated 10, so that gives a benchmark.

BryanHurst commented 6 years ago

Okay, lets go ahead and spend 4 hours on working towards the remaining test databases.

missyschoenbaum commented 6 years ago

@BryanHurst I check the timing of our poster. It is 11/15. If we cannot work through this by then, can we post something to latest link that lets people know we are working towards new release?

BryanHurst commented 6 years ago

We'll push to get everything done by then, but if not we can put a notice up somewhere.

ndh2 commented 5 years ago

@BryanHurst fixed test databases should be committed to master now?

BryanHurst commented 5 years ago

I haven't merged the vaccination rings branch to master in the CEngine repo yet, so you can go ahead and commit to the other branch and merge when you see fit.

ndh2 commented 5 years ago

I've hit 4 hours of time--the status:

  1. All of the test cases that didn't migrate have now been re-created.
  2. There are a few that don't pass. I think it's because we decided to make "round robin" priority an "always-on" thing instead of an option. (Round robin is explained here.) Some of the test cases were built to use purely oldest-first or largest-first etc. priorities and would need a bit of re-thinking to make them work with round-robin.

I don't think having those few not passing is a huge deal though, as long as we understand why.

I haven't merged the vaccination rings branch into master in ADSM-CEngine yet.

BryanHurst commented 5 years ago

Okay, after making some DB changes in the CEngine, I've merged the rings branch into master and made a new compile.

Everything seems good. I'm not currently setup to run the test suite, so I'll go with your recommendation that we are good to go.

BryanHurst commented 5 years ago

We can address the known failing tests at a later date.