new-version: handle RHCEPH and RHSCON products

Prior to this change, on rhscon-* or ceph-* dist-git branches, the
"rdopkg new-version" command would try to use fedpkg to upload sources,
rather than rhpkg. This meant that rdopkg would upload to the wrong
dist-git lookaside cache (or just fail to upload altogether).

The problem is that guess.osdist() could only return "RHOS" for Red Hat
OpenStack Platform dist-git branches. rdopkg would assume any other
dist-git branches were "RDO".

Update guess.osdist() to return more products than just RHOS. These now
show up properly in "rdopkg pkgenv".

Generalize new-version's rhpkg decision by simply checking if osdist
begins with the letters "RH".

Change-Id: Ic573c47265a3ee4f55a73dfe82eaec9453840398

Author: ktdreyer

doc/rdopkg.1.adoc

@@ -141,9 +141,10 @@ Don't forget to `git fetch --all` before running the action.
 
 You can use the `-N`/`--new-sources` or `-n`/`--no-new-sources` options to
 control whether `new-version` will run `fedpkg new-sources`
-(`rhpkg new-sources` on RHOS). By default, `rdopkg` will automatically enable
-or disable this step based on the dist-git branch name. RHOS branches
-(`rhos-*` or `rh-*`) default to `-N`. All other branches default to `-n`.
+(`rhpkg new-sources` on Red Hat downstream products). By default, `rdopkg`
+will automatically enable or disable this step based on the dist-git branch
+name. RH dist-git branches (`rhos-*`, `rh-*`, `ceph-*`, `rhscon-*`) default to
+`-N`. All other branches default to `-n`.
 
 After running `rdopkg new-version`, new commit will contain the changes.
 

rdopkg/actions/distgit/actions.py

@@ -42,8 +42,8 @@ def get_package_env(version=None, release=None, dist=None, branch=None,
         'branch': branch,
     }
     osdist = guess.osdist()
-    if osdist == 'RHOS':
-        log.info("RHOS package detected.")
+    if osdist.startswith('RH'):
+        log.info("RH package detected.")
         args['fedpkg'] = ['rhpkg']
     if not patches_branch:
         patches_branch = guess.patches_branch(branch, pkg=args['package'],

rdopkg/guess.py

@@ -239,11 +239,15 @@ def builds(release):
 
 
 def osdist(branch=None):
-    # which OpenStack/packaging distribution?
+    # which package distribution?
     if branch is None:
         branch = current_branch(default='')
     if branch.startswith('rhos-') or branch.startswith('rh-'):
         return 'RHOS'
+    if branch.startswith('ceph-'):
+        return 'RHCEPH'
+    if branch.startswith('rhscon-'):
+        return 'RHSCON'
     # XXX Detect 'Fedora' here? From r'f\d+' branches possibly.
     return 'RDO'
 
@@ -252,7 +256,7 @@ def new_sources(_osdist=None):
     # shall we run `$RPKG new-sources`?
     if not _osdist:
         _osdist = osdist()
-    if _osdist == 'RHOS':
+    if _osdist.startswith('RH'):
         # XXX: Fedora might also benefit from True
         # once osdist() detects it properly.
         return True