CI fixes for branch release (NOT FOR INCLUSION IN RELEASE!)

Not for the release, but just being used to test:
1. Don't rebase in CI, since we want a "raw" test.
2. Fix the annoying CI timeout for test_cln_plugin_reentrant.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

.github/workflows/ci.yaml

@@ -32,14 +32,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Rebase
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git fetch origin ${{ github.base_ref }}
-          git rebase origin/${{ github.base_ref }}
 
       - name: Set up Python 3.7
         uses: actions/setup-python@v4

tests/test_cln_rs.py

@@ -4,7 +4,7 @@
 from pyln.testing import node_pb2 as nodepb
 from pyln.testing import node_pb2_grpc as nodegrpc
 from pyln.testing import primitives_pb2 as primitivespb
-from pyln.testing.utils import env, TEST_NETWORK, wait_for, sync_blockheight
+from pyln.testing.utils import env, TEST_NETWORK, wait_for, sync_blockheight, TIMEOUT
 import grpc
 import pytest
 import subprocess
@@ -275,14 +275,13 @@ def test_cln_plugin_reentrant(node_factory, executor):
     f1 = executor.submit(l2.rpc.pay, i1)
     f2 = executor.submit(l2.rpc.pay, i2)
 
-    import time
-    time.sleep(3)
+    l1.daemon.wait_for_logs(["plugin-cln-plugin-reentrant: Holding on to incoming HTLC Object"] * 2)
 
     print("Releasing HTLCs after holding them")
     l1.rpc.call('release')
 
-    assert f1.result()
-    assert f2.result()
+    assert f1.result(timeout=TIMEOUT)
+    assert f2.result(timeout=TIMEOUT)
 
 
 def test_grpc_keysend_routehint(bitcoind, node_factory):