From 7eb8544759d143b6622a734ab61b14af8ce55d82 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Sat, 10 Nov 2018 17:44:02 +0100
Subject: [PATCH] Revert "Initial agentless SaltStack config for generic-worker
 on macOS"

This reverts commit f4c11ad7b920550851cf19965a5b2559be765066.
---
 etc/taskcluster/macos/.gitignore              |  1 -
 etc/taskcluster/macos/README.md               | 16 -------------
 etc/taskcluster/macos/Saltfile                |  2 --
 etc/taskcluster/macos/config/master           |  4 ----
 etc/taskcluster/macos/config/roster           |  2 --
 etc/taskcluster/macos/salt-ssh                | 14 -----------
 .../macos/states/generic-worker.sls           | 23 -------------------
 etc/taskcluster/macos/states/top.sls          |  3 ---
 8 files changed, 65 deletions(-)
 delete mode 100644 etc/taskcluster/macos/.gitignore
 delete mode 100644 etc/taskcluster/macos/README.md
 delete mode 100644 etc/taskcluster/macos/Saltfile
 delete mode 100644 etc/taskcluster/macos/config/master
 delete mode 100644 etc/taskcluster/macos/config/roster
 delete mode 100755 etc/taskcluster/macos/salt-ssh
 delete mode 100644 etc/taskcluster/macos/states/generic-worker.sls
 delete mode 100644 etc/taskcluster/macos/states/top.sls

diff --git a/etc/taskcluster/macos/.gitignore b/etc/taskcluster/macos/.gitignore
deleted file mode 100644
index 96286f5841e..00000000000
--- a/etc/taskcluster/macos/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.salt
diff --git a/etc/taskcluster/macos/README.md b/etc/taskcluster/macos/README.md
deleted file mode 100644
index 1ca96baa10b..00000000000
--- a/etc/taskcluster/macos/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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
-```
\ No newline at end of file
diff --git a/etc/taskcluster/macos/Saltfile b/etc/taskcluster/macos/Saltfile
deleted file mode 100644
index 044cd70e61e..00000000000
--- a/etc/taskcluster/macos/Saltfile
+++ /dev/null
@@ -1,2 +0,0 @@
-salt-ssh:
-  config_dir: ./config
\ No newline at end of file
diff --git a/etc/taskcluster/macos/config/master b/etc/taskcluster/macos/config/master
deleted file mode 100644
index cf59c94f2a9..00000000000
--- a/etc/taskcluster/macos/config/master
+++ /dev/null
@@ -1,4 +0,0 @@
-root_dir: .salt
-file_roots:
-  base:
-    - states
\ No newline at end of file
diff --git a/etc/taskcluster/macos/config/roster b/etc/taskcluster/macos/config/roster
deleted file mode 100644
index ddfe7089497..00000000000
--- a/etc/taskcluster/macos/config/roster
+++ /dev/null
@@ -1,2 +0,0 @@
-mac1:
-    host: servo-tc-mac1.servo.org
\ No newline at end of file
diff --git a/etc/taskcluster/macos/salt-ssh b/etc/taskcluster/macos/salt-ssh
deleted file mode 100755
index 5a6439a18e2..00000000000
--- a/etc/taskcluster/macos/salt-ssh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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" "${@}"
\ No newline at end of file
diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
deleted file mode 100644
index e07c7fbd5bc..00000000000
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ /dev/null
@@ -1,23 +0,0 @@
-/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
\ No newline at end of file
diff --git a/etc/taskcluster/macos/states/top.sls b/etc/taskcluster/macos/states/top.sls
deleted file mode 100644
index 79f7a40eed3..00000000000
--- a/etc/taskcluster/macos/states/top.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-base:
-  'mac*':
-    - generic-worker
\ No newline at end of file