Merge pull request #384 from zmarano/master

Promote stretch to stable, add buster as testing, jessie to oldstable.

bootstrapvz/common/releases.py

@@ -31,7 +31,8 @@ class _ReleaseAlias(_Release):
         return self.alias
 
 
-sid = _Release('sid', 10)
+sid = _Release('sid', 11)
+buster = _Release('buster', 10)
 stretch = _Release('stretch', 9)
 jessie = _Release('jessie', 8)
 wheezy = _Release('wheezy', 7)
@@ -48,9 +49,9 @@ rex = _Release('rex', 1.2)
 buzz = _Release('buzz', 1.1)
 
 unstable = _ReleaseAlias('unstable', sid)
-testing = _ReleaseAlias('testing', stretch)
-stable = _ReleaseAlias('stable', jessie)
-oldstable = _ReleaseAlias('oldstable', wheezy)
+testing = _ReleaseAlias('testing', buster)
+stable = _ReleaseAlias('stable', stretch)
+oldstable = _ReleaseAlias('oldstable', jessie)
 
 
 def get_release(release_name):

bootstrapvz/common/tasks/apt.py

@@ -83,7 +83,7 @@ class AddBackports(Task):
             msg = ('{system.release}-backports target already exists').format(**info.manifest_vars)
             logging.getLogger(__name__).info(msg)
         elif info.manifest.release == testing:
-            logging.getLogger(__name__).info('There are no backports for stretch/testing')
+            logging.getLogger(__name__).info('There are no backports for testing')
         elif info.manifest.release == unstable:
             logging.getLogger(__name__).info('There are no backports for sid/unstable')
         else:

tests/unit/releases_tests.py

@@ -28,9 +28,9 @@ def test_not_identity():
 
 
 def test_alias():
-    assert releases.oldstable == releases.wheezy
-    assert releases.stable == releases.jessie
-    assert releases.testing == releases.stretch
+    assert releases.oldstable == releases.jessie
+    assert releases.stable == releases.stretch
+    assert releases.testing == releases.buster
     assert releases.unstable == releases.sid