Skip to content

Commit

Permalink
Initial agentless SaltStack config for generic-worker on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Nov 15, 2018
1 parent 359ec7a commit 11b9391
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 0 deletions.
1 change: 1 addition & 0 deletions etc/taskcluster/macos/.gitignore
@@ -0,0 +1 @@
.salt
16 changes: 16 additions & 0 deletions etc/taskcluster/macos/README.md
@@ -0,0 +1,16 @@
# macOS

Servo’s macOS workers for Taskcluster are configured with
SaltStack in [agentless] mode.

[agentless]: https://docs.saltstack.com/en/getstarted/ssh/index.html

Either run `./salt-ssh`
to automatically install `salt-ssh` in `mach`’s existing Python virtualenv,
or install `salt-ssh` through some other mean and run in from this directory.

```sh
cd etc/taskcluster/macos
./salt-ssh '*' test.ping
./salt-ssh '*' state.apply test=True
```
2 changes: 2 additions & 0 deletions etc/taskcluster/macos/Saltfile
@@ -0,0 +1,2 @@
salt-ssh:
config_dir: ./config
4 changes: 4 additions & 0 deletions etc/taskcluster/macos/config/master
@@ -0,0 +1,4 @@
root_dir: .salt
file_roots:
base:
- states
2 changes: 2 additions & 0 deletions etc/taskcluster/macos/config/roster
@@ -0,0 +1,2 @@
mac1:
host: servo-tc-mac1.servo.org
14 changes: 14 additions & 0 deletions etc/taskcluster/macos/salt-ssh
@@ -0,0 +1,14 @@
#!/bin/sh

# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

set -o errexit
set -o nounset
set -o pipefail

cd "$(dirname $0)"
VENV_BIN="../../../python/_virtualenv/bin"
[ -x "${VENV_BIN}/salt-ssh" ] || "${VENV_BIN}/pip" install salt-ssh
"${VENV_BIN}/salt-ssh" "${@}"
23 changes: 23 additions & 0 deletions etc/taskcluster/macos/states/generic-worker.sls
@@ -0,0 +1,23 @@
/usr/local/bin/generic-worker:
file.managed:
- name:
- source: https://github.com/taskcluster/generic-worker/releases/download/v11.0.1/generic-worker-darwin-amd64
- source_hash: sha256=059331865670d3722a710f0b6f4dae97d347811cc347d1810c6dfc1b413c4b48
- mode: 755
- makedirs: True

/usr/local/bin/livelog:
file.managed:
- source: https://github.com/taskcluster/livelog/releases/download/v1.1.0/livelog-darwin-amd64
- source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
- mode: 755
- makedirs: True

/etc/generic-worker:
file.directory:
- dir_mode: 700

generic-worker new-openpgp-keypair --file /etc/generic-worker/key:
cmd.run:
- creates: /etc/generic-worker/key
- prepend_path: /usr/local/bin
3 changes: 3 additions & 0 deletions etc/taskcluster/macos/states/top.sls
@@ -0,0 +1,3 @@
base:
'mac*':
- generic-worker

0 comments on commit 11b9391

Please sign in to comment.