Unverified Commit e91377d5 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents db098f03 ee4fe06d

nixos/tests/atticd.nix

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ in 
          s3.wait_for_unit("minio.service")

          s3.wait_for_open_port(9000)

          s3.succeed(

              "mc config host add minio "

              "mc alias set minio "

              + "http://localhost:9000 "

              + "${accessKey} ${secretKey} --api s3v4",

              "mc mb minio/attic",

nixos/tests/nextcloud/with-objectstore.nix

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ runTest ( 


        with subtest("Check if file is in S3"):

            nextcloud.succeed(

                "mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4"

                "mc alias set minio https://acme.test ${accessKey} ${secretKey} --api s3v4"

            )

            files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n')

nixos/tests/outline.nix

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ in 


    # Create a test bucket on the server

    machine.succeed(

        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"

        "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"

    )

    machine.succeed("mc mb minio/outline")

nixos/tests/thanos.nix

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ import ./make-test-python.nix { 
      s3.wait_for_unit("minio.service")

      s3.wait_for_open_port(${toString minioPort})

      s3.succeed(

          "mc config host add minio "

          "mc alias set minio "

          + "http://localhost:${toString minioPort} "

          + "${s3.accessKey} ${s3.secretKey} --api s3v4",

          "mc mb minio/thanos-bucket",

nixos/tests/web-apps/lasuite-docs.nix

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ in 
      machine.wait_for_unit("lasuite-docs-collaboration-server.service")



    with subtest("Create S3 bucket"):

      machine.succeed("mc config host add minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")

      machine.succeed("mc alias set minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")

      machine.succeed("mc mb lasuite-docs")



    with subtest("Wait for web servers to start"):