Merge lp:~sil2100/ubuntu-cdimage/uc-series-and-more-rebuild into lp:ubuntu-cdimage
Status: | Merged |
---|---|
Merged at revision: | 2061 |
Proposed branch: | lp:~sil2100/ubuntu-cdimage/uc-series-and-more-rebuild |
Merge into: | lp:ubuntu-cdimage |
Diff against target: |
179 lines (+72/-20) 3 files modified
bin/rebuild-requests (+3/-0) lib/cdimage/config.py (+35/-13) lib/cdimage/tests/test_config.py (+34/-7) |
To merge this branch: | bzr merge lp:~sil2100/ubuntu-cdimage/uc-series-and-more-rebuild |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Langasek | Approve | ||
Review via email: mp+424288@code.launchpad.net |
Commit message
Add proper core series handling to the config. Convert the UC milestone series to Ubuntu series.
Description of the change
Add proper core series handling to the config. Convert the UC milestone series to Ubuntu series.
So the previous change wasn't entirely complete. Generally the ISO Tracker milestones result in the DIST being the core series (so like '22'), which doesn't really currently easily translate to anything in cdimage.
It's about time we actually started treating core series a bit more 'serious'. So I'm adding some code to the config.py Series and Config items to properly handle UC series. There were a few different ways to do it - originally I wanted to do a separate entry for Ubuntu Core items (with those having distribution=
Controversial might be the fact of hard-coding that devel == UCXX+2, but I think this is the logical choice. We *anyway* always handle it this way, just implicitly. We always assumed > than latest core to be the devel core series. I think this is the way to go here.
Since I added some unit tests, those can be ran by using `PYTHONPATH=lib python3 -m unittest cdimage. tests.test_ config` (since the test suite is still not clean due to my simplestream fixing branch not yet finished).