chore: rm mbt, trace tests from CI; fix dependabot (#2000)

* Remove MBT from pipeline * chore: disable trace tests * cleanup dependabot * cleanup test --------- Co-authored-by: MSalopek <[email protected]> (cherry picked from commit eb93342) # Conflicts: # .github/dependabot.yml # .github/workflows/test.yml
cosmos · Jul 16, 2024 · e86a261 · e86a261
1 parent 16ea5c7
commit e86a261
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -58,6 +58,29 @@ updates:
     labels:
       - dependencies
 
+<<<<<<< HEAD
+=======
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v4.3.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v4.3.x-lsm"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+>>>>>>> eb93342 (chore:  rm mbt, trace tests from CI; fix dependabot (#2000))
   - package-ecosystem: gomod
     directory: "/"
     schedule:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -90,6 +90,7 @@ jobs:
           name: "${{ github.sha }}-integration-coverage"
           path: ./integration-profile.out
 
+<<<<<<< HEAD
   test-mbt:
     runs-on: ubuntu-latest
     steps:
@@ -133,9 +134,11 @@ jobs:
           path: tests/mbt/driver/traces
           retention-days: 6 # to not clog our cloud storage too much, we retain only for a few days
 
+=======
+>>>>>>> eb93342 (chore:  rm mbt, trace tests from CI; fix dependabot (#2000))
   repo-analysis:
     runs-on: ubuntu-latest
-    needs: [tests, test-integration, test-mbt]
+    needs: [tests, test-integration]
     steps:
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]
@@ -229,36 +232,6 @@ jobs:
         run: |
           make test-e2e-compatibility-tests-latest
 
-  test-trace:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          lfs: true
-      - name: checkout LFS objects
-        run: git lfs checkout
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.22"
-          check-latest: true
-          cache: true
-          cache-dependency-path: go.sum
-      - uses: technote-space/[email protected]
-        id: git_diff
-        with:
-          PATTERNS: |
-            **/*.go
-            go.mod
-            go.sum
-            **/go.mod
-            **/go.sum
-            **/Makefile
-            Makefile
-            Dockerfile*
-      - name: trace-e2e tests
-        if: env.GIT_DIFF
-        run: |
-          make test-trace
   model-analysis:
     runs-on: ubuntu-latest
     steps: