diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-09 17:08:47 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-10 17:33:43 +0100 |
| commit | c28fa07a98177cc510d0bbb183ed437a175d0e8b (patch) | |
| tree | 9986136145867ce8ec54b6a06a0aa6a235c80749 | |
| parent | f4c11ad7b920550851cf19965a5b2559be765066 (diff) | |
| download | servo-c28fa07a98177cc510d0bbb183ed437a175d0e8b.tar.gz servo-c28fa07a98177cc510d0bbb183ed437a175d0e8b.zip | |
Initial generic-worker config file
| -rw-r--r-- | etc/taskcluster/macos/README.md | 6 | ||||
| -rw-r--r-- | etc/taskcluster/macos/Saltfile | 3 | ||||
| -rw-r--r-- | etc/taskcluster/macos/states/generic-worker.sls | 29 |
3 files changed, 28 insertions, 10 deletions
diff --git a/etc/taskcluster/macos/README.md b/etc/taskcluster/macos/README.md index 1ca96baa10b..54252cc2f9e 100644 --- a/etc/taskcluster/macos/README.md +++ b/etc/taskcluster/macos/README.md @@ -13,4 +13,8 @@ or install `salt-ssh` through some other mean and run in from this directory. cd etc/taskcluster/macos ./salt-ssh '*' test.ping ./salt-ssh '*' state.apply test=True -```
\ No newline at end of file +``` + +## Worker’s client ID + +`project/servo/worker/macos/1`
\ No newline at end of file diff --git a/etc/taskcluster/macos/Saltfile b/etc/taskcluster/macos/Saltfile index 044cd70e61e..ee77404e3dc 100644 --- a/etc/taskcluster/macos/Saltfile +++ b/etc/taskcluster/macos/Saltfile @@ -1,2 +1,3 @@ salt-ssh: - config_dir: ./config
\ No newline at end of file + config_dir: ./config + state_verbose: False
\ No newline at end of file diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls index e07c7fbd5bc..a832d949596 100644 --- a/etc/taskcluster/macos/states/generic-worker.sls +++ b/etc/taskcluster/macos/states/generic-worker.sls @@ -1,4 +1,7 @@ -/usr/local/bin/generic-worker: +{% set bin = "/usr/local/bin" %} +{% set keyfile = "/etc/generic-worker/key" %} + +{{ bin }}/generic-worker: file.managed: - name: - source: https://github.com/taskcluster/generic-worker/releases/download/v11.0.1/generic-worker-darwin-amd64 @@ -6,18 +9,28 @@ - mode: 755 - makedirs: True -/usr/local/bin/livelog: +{{ 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 +/etc/generic-worker/config.json: + file.serialize: + - makedirs: True + - mode: 600 + - show_changes: False + - formatter: json + - dataset: + provisionerId: proj-servo + workerType: macos + workerId: servo-macos-1 + clientId: project/servo/worker/macos/1 + publicIP: {{ salt.network.ip_addrs()[0] }} + signingKeyLocation: {{ keyfile }} -generic-worker new-openpgp-keypair --file /etc/generic-worker/key: +generic-worker new-openpgp-keypair --file {{ keyfile }}: cmd.run: - - creates: /etc/generic-worker/key - - prepend_path: /usr/local/bin
\ No newline at end of file + - creates: {{ keyfile }} + - prepend_path: {{ bin }} |