Skip to content

Commit c926fb4

Browse files
committed
fixes and clarifications for provision scripts
1 parent e641f52 commit c926fb4

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

bin/run_base_ci.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Distributed
22
import Nanosoldier, GitHub, Sockets
33

4-
nodes = Dict(Any => addprocs(1))
4+
nodes = Dict(Any => addprocs(1; exeflags="--project=$(ENV["JULIA_PROJECT"])"))
55
@everywhere import Nanosoldier
66

77
auth = GitHub.authenticate("GITHUB_AUTH00000000000000000000000000000")

provision-server.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ PATCH=`echo $VERSION | cut -d . -f 3`
1313
sudo apt update
1414

1515
# create a (non-privileged) user to run the server:
16-
sudo useradd nanosoldier || true
16+
sudo useradd -m nanosoldier || true
1717
sudo usermod -aG nanosoldier `whoami`
1818
echo "`whoami` ALL= (nanosoldier) NOPASSWD: ALL
1919
Defaults> nanosoldier umask=0777" | sudo tee -a /etc/sudoers.d/99-nanosoldier
2020

21-
sudo -u nanosoldier [ -f ~nanosoldier/.ssh/id_rsa.pub ] || sudo -u nanosoldier ssh-keygen -N '' -f ~nanosoldier/.ssh/id_rsa
21+
sudo -u nanosoldier [ -f ~nanosoldier/.ssh/id_ed25519.pub ] || sudo -u nanosoldier ssh-keygen -N '' -f ~nanosoldier/.ssh/id_ed25519 -t ed25519
2222
sudo -u nanosoldier git config --global user.name "nanosoldier"
2323
sudo -u nanosoldier git config --global user.email "[email protected]"
2424
sudo -u nanosoldier ssh -T [email protected] || true
@@ -36,8 +36,8 @@ echo "-------------"
3636
echo
3737
echo "install this ssh key in github for user @nanosoldier at"
3838
echo " https://github.com/settings/ssh/new"
39-
echo " and on all worker machines at ~nanosoldier/.ssh/authorized_keys"
40-
sudo -u nanosoldier cat ~nanosoldier/.ssh/id_rsa.pub
39+
echo "and on all worker machines at ~nanosoldier/.ssh/authorized_keys"
40+
sudo -u nanosoldier cat ~nanosoldier/.ssh/id_ed25519.pub
4141
echo
4242
echo "and generate an auth-token for later at"
4343
echo " https://github.com/settings/tokens/new"
@@ -66,8 +66,8 @@ echo " . ../cset/bin/activate"
6666
echo " setarch -R ../julia-$VERSION/bin/julia -L bin/setup_test_ci.jl -e 'using Sockets; run(server, IPv4(0), ENV[\"GITHUB_PORT\"])'"
6767
echo
6868
echo "or with a helper script:"
69-
echo " cp bin/run_base_ci.jl .."
70-
echo " chgrp nanosoldier ../run_base_ci.jl"
71-
echo " chmod 660 ../run_base_ci.jl"
69+
echo " (umask 007 && cp bin/run_base_ci.jl ..)"
70+
echo " (umask 007 && touch ../run_base_ci.stdout ../run_base_ci.stderr)"
71+
echo " sudo chgrp nanosoldier ../run_base_ci.jl ../run_base_ci.stdout ../run_base_ci.stderr"
7272
echo " \${EDITOR:-vim} ../run_base_ci.jl"
7373
echo " ./run_base_ci"

provision-worker.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ cat /proc/interrupts
4242
# irqbalance
4343

4444
# create a (non-privileged) user to run the build and test:
45-
sudo useradd nanosoldier-worker || true
45+
sudo useradd -m nanosoldier-worker || true
4646
sudo usermod -aG nanosoldier-worker `whoami`
4747
sudo usermod -aG nanosoldier-worker nanosoldier
4848

@@ -65,4 +65,7 @@ echo "-------------"
6565
echo "manual steps (for each worker)"
6666
echo "-------------"
6767
echo
68-
echo "replace ~nanosoldier/.ssh/id_rsa* with those files from the master"
68+
echo "install ssh key from master server to this worker"
69+
echo "sudo -u nanosoldier vim ~nanosoldier/.ssh/authorized_keys"
70+
echo "sudo -u nanosoldier chmod 600 ~nanosoldier/.ssh/authorized_keys"
71+
echo " # on server # sudo -u nanosoldier scp /home/nanosoldier/.ssh/id_ed25519 /home/nanosoldier/.ssh/id_ed25519.pub `hostname`:.ssh"

0 commit comments

Comments
 (0)