plone.app.discussion plip: add plone.app.upgrade branch.

plipbase: set var directory for instance-cmfplone.

plips/plip-padiscussion-addon.cfg

@@ -6,15 +6,18 @@ auto-checkout +=
     plone.app.contenttypes
     plone.app.dexterity
     plone.app.discussion
-    Products.CMFPlone
 
 [sources]
 plone.app.contenttypes              = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=pa-discussion-core-addon
 plone.app.dexterity                 = git ${remotes:plone}/plone.app.dexterity.git pushurl=${remotes:plone_push}/plone.app.dexterity.git branch=pa-discussion-coreaddon
 plone.app.discussion                = git ${remotes:plone}/plone.app.discussion.git pushurl=${remotes:plone_push}/plone.app.discussion.git branch=core-addon
+plone.app.upgrade                   = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=pa-discussion-coreaddon
 Products.CMFPlone                   = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=pa-discussion-core-addon
 
 
-# to test alone without plone.app.discussion
-# [instance]
-# eggs = Products.CMFPlone
+# To test alone without plone.app.discussion it is easiest to use
+# bin/instance-cmfplone, but with plone.app.caching and plone.app.upgrade as extras.
+[instance-cmfplone]
+eggs +=
+    plone.app.caching
+    plone.app.upgrade

plips/plipbase.cfg

@@ -19,6 +19,9 @@ var = ${buildout:directory}/../var
 [instance]
 var = ${conf:var}
 
+[instance-cmfplone]
+var = ${conf:var}
+
 [environment]
 BUILDOUT_DIR = ${buildout:directory}/..
 # This dir must exist.  Recent plone.recipe.zope2instance normally creates it: