Revert bisect script

Author: timfel

mx.graalpython/mx_graalpython_bisect.py

@@ -266,18 +266,26 @@ def _bisect_benchmark(argv, bisect_id, email_to):
     primary_suite = mx.primary_suite()
 
     def checkout_enterprise():
+        # First try to get the revision we explicitly specify in ci-overlays. If that doesn't match with graal, then we
+        # fall back on mx checkout-downstream
         suite = get_suite('graalpython')
         ce_suite = get_suite('/vm')
         ce_rev = ce_suite.vc.tip(ce_suite.vc_dir).strip()
         ee_suite = get_suite('/vm-enterprise')
-        # Move CE and EE to get the revisions we explicitly specify in graalpython
-        mx.run_mx(['--dy', '/graalpython-enterprise', 'sforceimports'], suite=suite)
-        # Move CE to the revision EE imports
+        overlays = '../ci-overlays'
+        if not os.path.isdir(overlays):
+            sys.exit("Needs to have ci-overlays checkout")
+        with open(os.path.join(get_suite("graalpython").dir, "ci.jsonnet")) as f:
+            overlay_rev = json.load(f)['overlay']
+        suite.vc.update_to_branch(overlays, overlay_rev)
+        constants_file = os.path.join(overlays, 'python/imported-constants.json')
+        with open(constants_file) as f:
+            ee_rev = json.load(f)['GRAAL_ENTERPRISE_REVISION']
+        ee_suite.vc.update_to_branch(ee_suite.vc_dir, ee_rev)
         mx.run_mx(['sforceimports'], suite=ee_suite)
         if ce_suite.vc.tip(ce_suite.vc_dir).strip() != ce_rev:
-            # The enterprise rev we import into graalpython does not match what
-            # EE's sforceimports now got us. Fall back to mx
-            # checkout-downstream to find older compatible enterprise rev
+            # The enterprise rev specified in ci-overlays imports newer graal than graalpython does. Fall back to
+            # mx checkout-downstream to find older compatible enterprise rev
             ce_suite.vc.update_to_branch(ce_suite.vc_dir, ce_rev)
             mx.run_mx(['checkout-downstream', 'vm', 'vm-enterprise', '--no-fetch'], suite=ee_suite)