builder: handle bundle state changes

Move the affected sources to attic whenever the bundle state changes.

Author: rhubert

pym/bob/builder.py

@@ -68,9 +68,11 @@ def invalidate(self):
 
 CHECKOUT_STATE_VARIANT_ID = None    # Key in checkout directory state for step variant-id
 CHECKOUT_STATE_BUILD_ONLY = 1       # Key for checkout state of build-only builds
+CHECKOUT_STATE_BUNDLE = 2           # Store whether the checkout origin was a bundle or not
 
 # Keys in checkout getDirectoryState that are not directories
-CHECKOUT_NON_DIR_KEYS = {CHECKOUT_STATE_VARIANT_ID, CHECKOUT_STATE_BUILD_ONLY}
+CHECKOUT_NON_DIR_KEYS = {CHECKOUT_STATE_VARIANT_ID, CHECKOUT_STATE_BUILD_ONLY,
+                         CHECKOUT_STATE_BUNDLE}
 
 def compareDirectoryState(left, right):
     """Compare two directory states while ignoring the SCM specs.
@@ -88,6 +90,10 @@ def compareDirectoryState(left, right):
     right = { d : v[0] for d, v in right.items() if d != CHECKOUT_STATE_BUILD_ONLY }
     return left == right
 
+def compareBundleState(left, right):
+    _r = right[CHECKOUT_STATE_BUNDLE] if CHECKOUT_STATE_BUNDLE in right else False
+    return left[CHECKOUT_STATE_BUNDLE] == _r
+
 def checkoutsFromState(state):
     """Return only the tuples related to SCMs from the checkout state.
 
@@ -356,7 +362,7 @@ def fmt(step, props):
         return fmt
 
     def __init__(self, verbose, force, skipDeps, buildOnly, preserveEnv,
-                 envWhiteList, bobRoot, cleanBuild, noLogFile):
+                 envWhiteList, bobRoot, cleanBuild, noLogFile, unbundle):
         self.__wasRun= {}
         self.__wasSkipped = {}
         self.__wasDownloadTried = {}
@@ -397,6 +403,7 @@ def __init__(self, verbose, force, skipDeps, buildOnly, preserveEnv,
         self.__executor = None
         self.__attic = True
         self.__slimSandbox = False
+        self.__unbundle = unbundle
 
     def setExecutor(self, executor):
         self.__executor = executor
@@ -1102,6 +1109,7 @@ async def _cookCheckoutStep(self, checkoutStep, depth):
         checkoutState = checkoutStep.getScmDirectories().copy()
         checkoutState[CHECKOUT_STATE_VARIANT_ID] = (checkoutDigest, None)
         checkoutState[CHECKOUT_STATE_BUILD_ONLY] = checkoutBuildOnlyState(checkoutStep, checkoutInputHashes)
+        checkoutState[CHECKOUT_STATE_BUNDLE] = (self.__unbundle, None)
         currentResultHash = HashOnce(checkoutStep)
         if self.__buildOnly and (BobState().getResultHash(prettySrcPath) is not None):
             inputChanged = checkoutBuildOnlyStateChanged(checkoutState, oldCheckoutState)
@@ -1147,7 +1155,10 @@ async def _cookCheckoutStep(self, checkoutStep, depth):
             elif not checkoutStep.isDeterministic():
                 checkoutReason = "indeterministic"
             elif not compareDirectoryState(checkoutState, oldCheckoutState):
-                checkoutReason = "recipe changed"
+                if not compareBundleState(checkoutState, oldCheckoutState):
+                    checkoutReason = "bundle mode changed"
+                else:
+                    checkoutReason = "recipe changed"
             elif (checkoutInputHashes != BobState().getInputHashes(prettySrcPath)):
                 checkoutReason = "dependency changed"
             elif (checkoutStep.getMainScript() or checkoutStep.getPostRunCmds()) \
@@ -1171,8 +1182,10 @@ async def _cookCheckoutStep(self, checkoutStep, depth):
                             BobState().setAtticDirectoryState(atticPath, scmSpec)
                         del oldCheckoutState[scmDir]
                         BobState().setDirectoryState(prettySrcPath, oldCheckoutState)
-                    elif scmDigest != checkoutState.get(scmDir, (None, None))[0]:
+                    elif (scmDigest != checkoutState.get(scmDir, (None, None))[0]) or \
+                            not compareBundleState(checkoutState, oldCheckoutState):
                         canSwitch = (scmDir in scmMap) and scmDigest and \
+                                     compareBundleState(checkoutState, oldCheckoutState) and \
                                      scmSpec is not None and \
                                      scmMap[scmDir].canSwitch(getScm(scmSpec)) and \
                                      os.path.exists(scmPath)

pym/bob/cmds/jenkins/exec.py

@@ -223,7 +223,7 @@ def doJenkinsExecuteRun(argv, bobRoot):
     with EventLoopWrapper() as (loop, executor):
         setVerbosity(TRACE)
         builder = LocalBuilder(TRACE, False, False, False, False, envWhiteList,
-                bobRoot, False, True)
+                bobRoot, False, True, False)
         builder.setBuildDistBuildIds(dependencyBuildIds)
         builder.setExecutor(executor)
         builder.setArchiveHandler(getArchiver(