Revert "Support running dist compilations in unprivileged scenarios (#…

…128)" This reverts commit 20a08fc.
mozilla · Mar 27, 2023 · 8742d91 · 8742d91
1 parent 569f2d7
commit 8742d91
Show file tree

Hide file tree

Showing 3 changed files with 152 additions and 276 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
         run: cargo ${{ matrix.cargo_cmd }}
 
   test:
-    name: test ${{ matrix.os }} rust ${{ matrix.rustc || 'stable' }} ${{ matrix.extra_desc }} ${{ matrix.dist_exec_strategy }}
+    name: test ${{ matrix.os }} rust ${{ matrix.rustc || 'stable' }} ${{ matrix.extra_desc }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow_failure || false }}
     timeout-minutes: 30
@@ -52,15 +52,6 @@ jobs:
             rustc: "1.64.0"
             extra_desc: dist-server
             extra_args: --no-default-features --features=dist-tests test_dist_ -- --test-threads 1
-            cachepot_log: cachepot=trace
-            dist_exec_strategy: docker
-          - os: ubuntu-20.04
-            rustc: 1.56.1
-            extra_desc: dist-worker
-            extra_args: --no-default-features --features=dist-tests test_dist_ -- --test-threads 1
-            cachepot_log: cachepot=trace
-            cachepot_sandbox: userns
-            dist_exec_strategy: spawn
           - os: ubuntu-20.04
             rustc: stable
           - os: ubuntu-20.04
@@ -82,17 +73,10 @@ jobs:
             rustc: beta
     env:
       RUST_BACKTRACE: 1
-      DIST_EXEC_STRATEGY: ${{ matrix.dist_exec_strategy }}
-      CACHEPOT_SANDBOX: ${{ matrix.cachepot_sandbox }}
-      CACHEPOT_LOG: ${{ matrix.cachepot_log }}
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
 
-      - name: Install bubblewrap (needed for dist test suite)
-        if: contains(matrix.extra_desc, 'dist-worker')
-        run: sudo apt install bubblewrap -y
-
       - name: Install rust
         uses: ./.github/actions/rust-toolchain
         with: