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

Merge master into staging-next

parents d665ddf4 5f296019
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ jobs:
  tag:
    name: Tag
    runs-on: ubuntu-24.04-arm
    needs: [ process ]
    needs: [ get-merge-commit, process ]
    if: needs.process.outputs.targetRunId
    permissions:
      pull-requests: write
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ jobs:
              ;;
            pull_request_target)
              if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then
                echo "Checking the commits:\n$commits"
                echo -e "Checking the commits:\n$commits"
                echo "$commits" >> "$GITHUB_OUTPUT"
              else
                # Skipping so that no notifications are sent
+1 −4
Original line number Diff line number Diff line
@@ -63,10 +63,7 @@ let
      fs = pkgs.lib.fileset;
      nixFilesSrc = fs.toSource {
        root = ../.;
        fileset = fs.difference (fs.unions [
          (fs.fileFilter (file: file.hasExt "nix") ../.)
          ../.git-blame-ignore-revs
        ]) (fs.maybeMissing ../.git);
        fileset = fs.difference ../. (fs.maybeMissing ../.git);
      };
    in
    {
+10 −1
Original line number Diff line number Diff line
@@ -71,10 +71,19 @@ An SSH-based backdoor to log into machines can be enabled with
{
  name = "…";
  nodes.machines = { /* … */ };
  sshBackdoor.enable = true;
  interactive.sshBackdoor.enable = true;
}
```

::: {.warning}
Make sure to only enable the backdoor for interactive tests
(i.e. by using `interactive.sshBackdoor.enable`)! This is the only
supported configuration.

Running a test in a sandbox with this will fail because `/dev/vhost-vsock` isn't available
in the sandbox.
:::

This creates a [vsock socket](https://man7.org/linux/man-pages/man7/vsock.7.html)
for each VM to log in with SSH. This configures root login with an empty password.

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ up a VirtualBox guest, follow these instructions:

1.  Base Memory Size: 768 MB or higher.

1.  New Hard Disk of 8 GB or higher.
1.  New Hard Disk of 10 GB or higher.

1.  Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM)

Loading