Merge pull request #14262 from lovesegfault/ci-cleanup-s3

ci: cleanup s3 tests

.github/workflows/ci.yml

@@ -67,29 +67,18 @@ jobs:
             instrumented: false
             primary: true
             stdenv: stdenv
-            withAWS: true
-          # TODO: remove once curl-based-s3 fully lands
-          - scenario: on ubuntu (no s3)
-            runs-on: ubuntu-24.04
-            os: linux
-            instrumented: false
-            primary: false
-            stdenv: stdenv
-            withAWS: false
           - scenario: on macos
             runs-on: macos-14
             os: darwin
             instrumented: false
             primary: true
             stdenv: stdenv
-            withAWS: true
           - scenario: on ubuntu (with sanitizers / coverage)
             runs-on: ubuntu-24.04
             os: linux
             instrumented: true
             primary: false
             stdenv: clangStdenv
-            withAWS: true
     name: tests ${{ matrix.scenario }}
     runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 60
@@ -112,14 +101,12 @@ jobs:
       run: |
         nix build --file ci/gha/tests/wrapper.nix componentTests -L \
           --arg withInstrumentation ${{ matrix.instrumented }} \
-          --argstr stdenv "${{ matrix.stdenv }}" \
-          ${{ format('--arg withAWS {0}', matrix.withAWS) }}
+          --argstr stdenv "${{ matrix.stdenv }}"
     - name: Run VM tests
       run: |
         nix build --file ci/gha/tests/wrapper.nix vmTests -L \
           --arg withInstrumentation ${{ matrix.instrumented }} \
-          --argstr stdenv "${{ matrix.stdenv }}" \
-          ${{ format('--arg withAWS {0}', matrix.withAWS) }}
+          --argstr stdenv "${{ matrix.stdenv }}"
       if: ${{ matrix.os == 'linux' }}
     - name: Run flake checks and prepare the installer tarball
       run: |
@@ -131,7 +118,6 @@ jobs:
         nix build --file ci/gha/tests/wrapper.nix codeCoverage.coverageReports -L \
           --arg withInstrumentation ${{ matrix.instrumented }} \
           --argstr stdenv "${{ matrix.stdenv }}" \
-          ${{ format('--arg withAWS {0}', matrix.withAWS) }} \
           --out-link coverage-reports
         cat coverage-reports/index.txt >> $GITHUB_STEP_SUMMARY
       if: ${{ matrix.instrumented }}

ci/gha/tests/default.nix

@@ -12,7 +12,6 @@
   componentTestsPrefix ? "",
   withSanitizers ? false,
   withCoverage ? false,
-  withAWS ? null,
   ...
 }:
 
@@ -57,9 +56,6 @@ rec {
       # Boehm is incompatible with ASAN.
       nix-expr = prev.nix-expr.override { enableGC = !withSanitizers; };
 
-      # Override AWS configuration if specified
-      nix-store = prev.nix-store.override (lib.optionalAttrs (withAWS != null) { inherit withAWS; });
-
       mesonComponentOverrides = lib.composeManyExtensions componentOverrides;
       # Unclear how to make Perl bindings work with a dynamically linked ASAN.
       nix-perl-bindings = if withSanitizers then null else prev.nix-perl-bindings;
@@ -226,9 +222,6 @@ rec {
     };
 
   vmTests = {
-  }
-  // lib.optionalAttrs (withAWS == true) {
-    # S3 binary cache store test using curl implementation
     inherit (nixosTests) curl-s3-binary-cache-store;
   }
   // lib.optionalAttrs (!withSanitizers && !withCoverage) {

ci/gha/tests/wrapper.nix

@@ -5,7 +5,6 @@
   stdenv ? "stdenv",
   componentTestsPrefix ? "",
   withInstrumentation ? false,
-  withAWS ? null,
 }@args:
 import ./. (
   args
@@ -13,6 +12,5 @@ import ./. (
     getStdenv = p: p.${stdenv};
     withSanitizers = withInstrumentation;
     withCoverage = withInstrumentation;
-    inherit withAWS;
   }
 )