From 08dcfd52a3e3871ce099ef23737ef7dc7b982a0d Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Tue, 16 May 2023 12:48:08 +0000 Subject: [PATCH] Revert "ci: run from root" This reverts commit 3dd9071057e895f36e216b7206357e7c27337b12. --- .github/workflows/e2e.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cdcc6bb..b2bd0ab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -75,6 +75,7 @@ jobs: ssh root@$IP "curl -L https://nixos.org/nix/install | sh -s -- --daemon" ssh root@$IP "echo 'experimental-features = nix-command flakes' >> /etc/nix/nix.conf" + ssh root@$IP "useradd user && cp -r /root/.ssh /home/user/ && chown -R user:user /home/user" echo 'name = "out-of-tree script"' >> .out-of-tree.toml echo 'type = "script"' >> .out-of-tree.toml @@ -85,13 +86,13 @@ jobs: echo 'release_mask = ".*"' >> .out-of-tree.toml echo -e '#!/bin/sh\necho ok' >> script.sh - scp .out-of-tree.toml script.sh root@$IP: + scp .out-of-tree.toml script.sh user@$IP: - ssh root@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug kernel list-remote --distro=${{ matrix.os.distro }} --ver=${{ matrix.os.release }}" - ssh root@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug kernel autogen --max=1 --shuffle" - ssh root@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug pew --qemu-timeout=10m" + ssh user@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug kernel list-remote --distro=${{ matrix.os.distro }} --ver=${{ matrix.os.release }}" + ssh user@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug kernel autogen --max=1 --shuffle" + ssh user@$IP "source /etc/profile.d/nix.sh; nix run github:out-of-tree/out-of-tree/$GITHUB_SHA -- --log-level=debug pew --qemu-timeout=10m" - scp -r root@$IP:.out-of-tree/logs . + scp -r user@$IP:.out-of-tree/logs . - name: Archive logs if: always()