CI Restore to run all tests

Author: heinsaar

.github/workflows/tests.yaml

@@ -42,16 +42,10 @@ jobs:
       matrix:
         build_variant: [ipv6only-no-ble-no-wifi]
 
-<<<<<<< HEAD
         container:
             image: ghcr.io/project-chip/chip-build:133
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
-=======
-    env:
-      TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
-      BUILD_VARIANT: ${{ matrix.build_variant }}
->>>>>>> ff4e9bb5b2 (`CI` Run only REPL tests)
 
     runs-on: ubuntu-latest
 
@@ -109,7 +103,6 @@ jobs:
           path: /tmp/cores/
           retention-days: 5
 
-<<<<<<< HEAD
 
             - name: Build Apps
               run: |
@@ -418,12 +411,3 @@ jobs:
                   path: objdir-clone/
                   # objdirs are big; don't hold on to them too long.
                   retention-days: 5
-=======
-      - name: Upload objdir
-        uses: actions/upload-artifact@v4
-        if: ${{ failure() && !env.ACT }}
-        with:
-          name: crash-objdir-linux-python-repl
-          path: objdir-clone/
-          retention-days: 5
->>>>>>> ff4e9bb5b2 (`CI` Run only REPL tests)