Merge branch 'main' into renamespace_http

achamayou · Jun 28, 2024 · 81ad2a2 · 81ad2a2
2 parents 3435910 + 1123336
commit 81ad2a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 68 deletions.
diff --git a/.azure-pipelines-templates/matrix.yml b/.azure-pipelines-templates/matrix.yml
@@ -69,20 +69,6 @@ parameters:
       ctest_args: '-L "raft_scenario"'
 
 jobs:
-  # Debug
-  - ${{ each target in parameters.target }}:
-      - template: common.yml
-        parameters:
-          target: ${{ target }}
-          env: ${{ parameters.env[target] }}
-          cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.debug.cmake_args }} ${{ parameters.build[target].cmake_args }}"
-          cmake_env: "${{ parameters.build[target].cmake_env }}"
-          suffix: "Debug"
-          artifact_name: "${{ target }}_Debug"
-          ctest_filter: "${{ parameters.test[target].ctest_args }}"
-          depends_on: configure
-          installExtendedTestingTools: false
-
   # Tracing
   - template: common.yml
     parameters:
@@ -97,57 +83,6 @@ jobs:
       installExtendedTestingTools: false
       ninja_targets: "${{ parameters.build.tracing.ninja_targets }}"
 
-  # Performance
-  - ${{ if eq(parameters.perf_tests, 'run') }}:
-      - template: common.yml
-        parameters:
-          target: SGX
-          env: ${{ parameters.env.SGX }}
-          cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.perf.cmake_args }} ${{ parameters.build.SGX.cmake_args }}"
-          suffix: "Perf"
-          artifact_name: "SGX_Perf"
-          ctest_filter: "${{ parameters.test.perf.ctest_args }}"
-          depends_on: configure
-          installExtendedTestingTools: false
-
-  - ${{ if eq(parameters.perf_tests, 'run') }}:
-      - template: common.yml
-        parameters:
-          target: Virtual
-          env: ${{ parameters.env.Virtual }}
-          cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.perf.cmake_args }} ${{ parameters.build.Virtual.cmake_args }}"
-          cmake_env: "${{ parameters.build.Virtual.cmake_env }}"
-          suffix: "Perf"
-          artifact_name: "Virtual_Perf"
-          ctest_filter: "${{ parameters.test.virtual_perf.ctest_args }}"
-          depends_on: configure
-          installExtendedTestingTools: false
-
-  - ${{ if eq(parameters.perf_tests, 'run') }}:
-      - template: common.yml
-        parameters:
-          target: Virtual
-          env: ${{ parameters.env.Virtual }}
-          cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.perf.cmake_args }} ${{ parameters.build.Virtual.cmake_args }} -DWORKER_THREADS=2"
-          cmake_env: "${{ parameters.build.Virtual.cmake_env }}"
-          suffix: "Perf_MultiThreaded"
-          artifact_name: "Virtual_Perf_MultiThreaded"
-          ctest_filter: "-R pi_basic_mt"
-          depends_on: configure
-          installExtendedTestingTools: false
-
-  - ${{ if eq(parameters.perf_tests, 'run') }}:
-      - template: common.yml
-        parameters:
-          target: SGX
-          env: ${{ parameters.env.SGX }}
-          cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.perf.cmake_args }} ${{ parameters.build.SGX.cmake_args }} -DWORKER_THREADS=2"
-          suffix: "Perf_MultiThreaded"
-          artifact_name: "SGX_Perf_MultiThreaded"
-          ctest_filter: "-R pi_basic_mt"
-          depends_on: configure
-          installExtendedTestingTools: false
-
   - ${{ if eq(parameters.perf_tests, 'run') }}:
       - template: simulation.yml
         parameters:

diff --git a/tests/fuzzing.py b/tests/fuzzing.py
@@ -146,10 +146,17 @@ def fuzz_node_to_node(network, args):
         # Don't try to read any responses
         receive_data_after_fuzz=False,
         receive_data_after_each_request=False,
-        db_filename="/dev/shm/boofuzz.db",
     )
     fuzz_logger.session = session
 
+    # Monkey-patch: Remove any Db loggers from the boofuzz session. We never
+    # use them, and they're reliant on disk IO (for db commits) so sometimes very slow
+    session._fuzz_data_logger._fuzz_loggers = [
+        logger
+        for logger in session._fuzz_data_logger._fuzz_loggers
+        if not isinstance(logger, boofuzz.fuzz_logger_db.FuzzLoggerDb)
+    ]
+
     session.connect(req)
 
     LOG.warning("These tests are verbose and run for a long time")

diff --git a/tests/infra/github.py b/tests/infra/github.py
@@ -197,12 +197,12 @@ def local_branch():
         if tag_or_none:
             return tag_or_none
 
-        # ADO
+        # ADO or GHA
         short = None
         if "SYSTEM_PULLREQUEST_SOURCEBRANCH" in os.environ:
             short = os.environ["SYSTEM_PULLREQUEST_SOURCEBRANCH"]
         else:
-            ref = os.environ["BUILD_SOURCEBRANCH"]
+            ref = os.environ.get("BUILD_SOURCEBRANCH") or os.environ.get("GITHUB_REF")
             for prefix in ["refs/heads/", "refs/tags/", "refs/pull/"]:
                 if ref.startswith(prefix):
                     short = ref[len(prefix) :]