[vcpkg osx ci] update 2020-09-28 (#13799)

* [vcpkg osx ci] update to newer bits

these ones should actually work!

* update vagrantfile

* correct scripts, reformat, add docs

* Finish Get-InternalBaseBox, move archives

In order to avoid people maliciously deleting the boxes,
the archives share and file share are in different users now.

* baseline libqcow to be fixed later

* actually check for the mount point

* fix Install-Prerequisites again

* add +x to Get-InternalBaseBox.ps1

additionally, fix some errors

4 files changed, 33 insertions, 7 deletions

diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile
index 91a59860c..d13a5f652 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile
@@ -32,7 +32,9 @@ devops_url = configuration['devops_url']
 agent_pool = configuration['agent_pool']
 pat = configuration['pat']
 archives = configuration['archives']
-archives_url = "//#{archives['username']}:#{url_encode(archives['access_key'])}@#{archives['urn']}/#{archives['share']}"
+archives_username = archives['username']
+archives_urn = archives['urn']
+archives_path = archives['path']
 
 Vagrant.configure('2') do |config|
   # give them extra time to boot up
@@ -102,7 +104,7 @@ Vagrant.configure('2') do |config|
   config.vm.provision "shell",
     run: 'once',
     name: 'Mount archives directory',
-    inline: "mount_smbfs -d 777 -f 777 #{archives_url} ~/Data/archives",
+    inline: "sshfs #{archives_username}@#{archives_urn}:#{archives_path} ~/Data/archives",
     privileged: false
 
   config.vm.provision 'shell',
diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json
index bd9b33ae4..28e24e6a3 100644
--- a/scripts/azure-pipelines/osx/configuration/installables.json
+++ b/scripts/azure-pipelines/osx/configuration/installables.json
@@ -17,6 +17,15 @@
       "InstallerPath": "vagrant.pkg"
     }
   ],
+  "Brew": [
+    {
+      "Name": "osxfuse",
+      "Kind": "cask"
+    },
+    {
+      "Name": "sshfs"
+    }
+  ],
   "VBoxExtensions": [
     {
       "Name": "Extension Pack",
diff --git a/scripts/azure-pipelines/osx/configuration/installables.schema.json b/scripts/azure-pipelines/osx/configuration/installables.schema.json
index 9f7734cc6..13476e776 100644
--- a/scripts/azure-pipelines/osx/configuration/installables.schema.json
+++ b/scripts/azure-pipelines/osx/configuration/installables.schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "$schema": "https://json-schema.org/draft-07/schema",
   "type": "object",
   "definitions": {
     "sha256": {
@@ -9,6 +9,7 @@
   },
   "required": [
     "Applications",
+    "Brew",
     "VBoxExtensions"
   ],
   "properties": {
@@ -36,6 +37,22 @@
         }
       }
     },
+    "Brew": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [ "Name" ],
+        "properties": {
+          "Name": {
+            "type": "string"
+          },
+          "Kind": {
+            "type": "string",
+            "enum": [ "cask" ]
+          }
+        }
+      }
+    },
     "VBoxExtensions": {
       "type": "array",
       "items": {
diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
index d806f4861..0b1ed2f32 100644
--- a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
+++ b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
@@ -37,15 +37,13 @@
       "type": "object",
       "required": [
         "username",
-        "access_key",
         "urn",
-        "share"
+        "path"
       ],
       "properties": {
         "username": { "type": "string" },
-        "access_key": { "type": "string" },
         "urn": { "type": "string" },
-        "share": { "type": "string" }
+        "path": { "type": "string" }
       }
     }
   }