Skip to content

Commit 364b8a9

Browse files
committed
ansible: release docker hosts, remove old cross-compile machines & scripts
1 parent bb73d28 commit 364b8a9

File tree

7 files changed

+23
-118
lines changed

7 files changed

+23
-118
lines changed

ansible/MANUAL_STEPS.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* [Adding firewall entries for Jenkins workers](#adding-firewall-entries-for-jenkins-workers)
44
* [`release-*` machines](#release--machines)
5+
* [`release-*container*` machines](#release-container-machines)
56
* [macOS release machines](#macos-release-machines)
67
* [Full Xcode](#full-xcode)
78
* [Signing certificates](#signing-certificates)
@@ -15,7 +16,6 @@
1516
* [Install XL compilers](#install-xl-compilers)
1617
* [Fix "Missing" shared objects](#fix-missing-shared-objects)
1718
* [Preparing gcc distributables](#preparing-gcc-distributables)
18-
* [Preparing ccache distributables](#preparing-ccache-distributables)
1919
* [Windows (Azure/Rackspace)](#windows-azurerackspace)
2020
* [Control machine (where Ansible is run)](#control-machine-where-ansible-is-run)
2121
* [Target machines](#target-machines)
@@ -50,14 +50,18 @@ To add an entry do the following:
5050
Once setup, they must have `~iojs/.ssh` cloned from another machine, so they
5151
have the ssh setup and keys required to upload release artifacts to the
5252
nodejs.org web server. The result will be 2 files, an `id_rsa` containing
53-
a private key, and a config containing:
53+
a private key, and a `config` containing:
54+
5455
```
5556
Host node-www
5657
HostName direct.nodejs.org
5758
User staging
5859
IdentityFile ~/.ssh/id_rsa
5960
```
6061

62+
Both the `config` file and `id_rsa` should be owned and only readable by the
63+
user: `chmod 700 .ssh && chmod 600 .ssh/*`.
64+
6165
Its necessary to accept the `known_hosts` keys interactively on first ssh or
6266
the release builds will fail. After setting up .ssh, do something like this:
6367

@@ -66,6 +70,21 @@ ssh node-www date
6670
// ... accept the host keys
6771
```
6872

73+
### `release-*container*` machines
74+
75+
In the case of Docker container release hosts, the SSH configuration above works
76+
differently since the `~iojs` home directories are elsewhere on the host
77+
machine. The Docker containers are started with `/home/iojs` inside the
78+
container mounted from `/home/iojs/name-of-container/` on the host machine.
79+
Therefore, the above SSH configuration should take place in
80+
`/home/iojs/name-of-container/.ssh/`, with permissions set appropriately.
81+
82+
`known_hosts` can be primed and SSH tested from within the running containers:
83+
84+
1. Find the running container ID using `docker ps`
85+
2. Enter the container using `docker exec <containerid> -ti bash`
86+
3. Run `ssh node-www date` (as above)
87+
6988
### macOS release machines
7089

7190
Previous notes: [#1393](https://github.com/nodejs/build/issues/1393)

ansible/inventory.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ hosts:
4242
smartos15-x64-2: {ip: 165.225.148.139}
4343
smartos17-x64-2: {ip: 165.225.149.208}
4444
smartos18-x64-2: {ip: 165.225.148.12}
45-
ubuntu1604_arm_cross-x64-1: {ip: 165.225.151.28, user: ubuntu}
45+
ubuntu1804_docker-x64-1: {ip: 165.225.150.76, user: ubuntu}
4646

4747
- macstadium:
4848
macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator}
@@ -83,7 +83,6 @@ hosts:
8383
- test:
8484

8585
- azure:
86-
msft-ubuntu1604_arm_cross-x64-1: {ip: nodejs.eastus2.cloudapp.azure.com, user: ubuntu}
8786
msft-win10_vcbt2015-x64-1: {ip: nodejs.eastus2.cloudapp.azure.com}
8887
msft-win10_vcbt2015-x64-2: {ip: nodejs.westus2.cloudapp.azure.com}
8988
msft-win10_vcbt2015-x64-3: {ip: nodejs.eastus2.cloudapp.azure.com}
@@ -132,7 +131,6 @@ hosts:
132131
smartos17-x64-4: {ip: 165.225.148.16}
133132
smartos18-x64-3: {ip: 165.225.151.114}
134133
smartos18-x64-4: {ip: 165.225.149.13}
135-
ubuntu1604_arm_cross-x64-1: {ip: 165.225.149.35, user: ubuntu}
136134
ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu}
137135
ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu}
138136

ansible/playbooks/jenkins/docker-host.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- hosts:
88
- test
9+
- release
910

1011
roles:
1112
- bootstrap

ansible/playbooks/jenkins/worker/create.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
- { role: 'benchmarking',
1919
when: is_benchmark is defined and is_benchmark|bool == True }
2020
- jenkins-worker
21-
- { role: 'cross-compiler',
22-
when: "'arm_cross' in inventory_hostname" }
2321

2422
pre_tasks:
2523
# Requires `secret: XXX` to be in the ansible/host_vars/HOST

ansible/roles/cross-compiler/files/cc-selector.sh

Lines changed: 0 additions & 61 deletions
This file was deleted.

ansible/roles/cross-compiler/tasks/main.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

ansible/roles/cross-compiler/vars/main.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)