Use scp to transfer files onto worker
This avoids roundtrips to gerrit review for testing changes
Change-Id: I56ead60fb1d532f6ad616caab16b979dc679b7d4
diff --git a/worker/README.md b/worker/README.md
index cbd61ac..43f590e 100644
--- a/worker/README.md
+++ b/worker/README.md
@@ -35,21 +35,12 @@
Steps:
-1. Become root `sudo su -`
+1. DEST=<IP address>
-1. `yum install -y git`
-
-1. Install the private key under .ssh/id_ecdsa, available to gerritcodereview-team members.
-
-1. Download:
+1. Transfer files.
```
- git clone https://gerrit.googlesource.com/gerrit-ci-scripts/
+ scp $HOME/.ssh/gerritforge/id_ecdsa ${DEST}:
+ scp worker/* ${DEST}:
+ ssh ${DEST} 'sudo sh -x $(pwd)/setup.sh'
```
-
-1. Run setup.sh (one time)
-
- ```
- sh gerrit-ci-scripts/worker/setup.sh
- ```
-
diff --git a/worker/setup-tunnel.service b/worker/setup-tunnel.service
index 4212d29..2a3a0ac 100644
--- a/worker/setup-tunnel.service
+++ b/worker/setup-tunnel.service
@@ -2,7 +2,7 @@
After=network.target
[Service]
-ExecStart=/root/gerrit-ci-scripts/worker/tunnel.sh
+ExecStart=/root/tunnel.sh
Restart=always
RestartSec=10
diff --git a/worker/setup.sh b/worker/setup.sh
index 21fd9f6..d756bc8 100755
--- a/worker/setup.sh
+++ b/worker/setup.sh
@@ -1,10 +1,15 @@
#!/bin/bash
+cd /root
# install reqs.
-yum install -y docker ppp telnet
+
+yum install -y docker ppp telnet git
mkdir -p .ssh
+src=$(dirname $0)
+cp $src/id_ecdsa .ssh/
+
# recognize gerritforge.
if ! grep --quiet 'gerrit-ci' .ssh/known_hosts ; then
echo '[gerrit-ci.gerritforge.com]:1022,[8.26.94.23]:1022 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUylKwtTDROpPce/sCfdMMR+N116TsZx5n4YHO8qPLaEhEXld+1T+hWe/HuITafW182hTnOjMHlK/GwH9A7KOS9XHHdBtHCYx0lH78kb+fvZsUtyuGlbQNXzQuyBIpJoYOtMRhn5aHR1sn1USHnnZp1V1dpDu/HYHjpj4pyA8I4i2BE89OVblxyggdulvgLfaLFJ+6Q9U+Mf+SHpufgsXDNlG/KTQVHioONoOnu47qbhJLSK+w5Q3dzaLa2CTPCZgdOFf3g6AQJWMKDEkTnReT9bR97lg1T59GoK2pLpem1gokiUQ052/qH/cL/b38XtW/IJCK9HmrV5Whc26dDg95' >> .ssh/known_hosts
@@ -20,7 +25,8 @@
sysctl net.ipv4.ip_forward=1
fi
-cp $(dirname $0)/setup-tunnel.service /etc/systemd/system/
+cp ${src}/setup-tunnel.service /etc/systemd/system/
+cp ${src}/tunnel.sh /root
systemctl daemon-reload
systemctl start docker
