From 47c5701747f86a7a0fb442a5f3ed454dd4a10b82 Mon Sep 17 00:00:00 2001
From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:25:57 -0800
Subject: [PATCH] [macos ci] 2022-02-04 update (#22942)

* add moar ram (no PR)

* Provision autoconf-archive on osx (PR #22872)

* [mpfr] Support Linux and OSX (PR #22845)

* VM software versions

* fix minor schema bug

* update pool

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
---
 scripts/azure-pipelines/azure-pipelines.yml                  | 2 +-
 scripts/azure-pipelines/osx/README.md                        | 5 ++++-
 scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb  | 2 +-
 .../osx/configuration/vagrant-box-configuration.json         | 4 +++-
 scripts/ci.baseline.txt                                      | 1 -
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 2bcb0a6a540f98..461eed33d984fc 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,7 +4,7 @@
 variables:
   windows-pool: 'PrWin-2022-01-11'
   linux-pool: 'PrLin-2021-12-13'
-  osx-pool: 'PrOsx-2022-01-03'
+  osx-pool: 'PrOsx-2022-02-04'
 
 jobs:
 - template: windows/azure-pipelines.yml
diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md
index 5de9349d43fbd2..bba656bae5ffb4 100644
--- a/scripts/azure-pipelines/osx/README.md
+++ b/scripts/azure-pipelines/osx/README.md
@@ -123,7 +123,10 @@ Once you've done that, add the software versions under [VM Software Versions](#v
 
 #### VM Software Versions
 
-* 2022-03-01:
+* 2022-02-04 (minor update to 2022-01-03)
+  * macOS: 12.1
+  * Xcode CLTs: 13.2
+* 2022-01-03:
   * macOS: 12.1
   * Xcode CLTs: 13.2
 * 2021-07-27:
diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb
index 0b21f259372d06..4d2330a13adad8 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb
@@ -6,7 +6,7 @@
   :machine_name => configuration['machine_name'],
   :box => configuration['box_name'],
   :box_version => configuration['box_version'],
-  :ram => 12000,
+  :ram => 24000,
   :cpu => 11
 }
 
diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json
index d800c257aa41bb..45917784a517bc 100644
--- a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json
+++ b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json
@@ -1,7 +1,8 @@
 {
-  "$schema": "./vagrant-vm-configuration.schema.json",
+  "$schema": "./vagrant-box-configuration.schema.json",
   "brew": [
     "autoconf",
+    "autoconf-archive",
     "automake",
     "bison",
     "gettext",
@@ -13,6 +14,7 @@
     "mono",
     "nasm",
     "pkg-config",
+    "texinfo",
     "yasm"
   ],
   "brew-cask": [
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 815ef7290d9250..a579a09cc3c358 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -797,7 +797,6 @@ mpir:x64-windows-static-md=skip
 mpir:arm64-windows=skip
 mpir:x64-osx=skip
 mpir:x64-linux=skip
-mpfr:x64-osx=fail
 mpfr:x64-linux=fail
 msix:x64-linux=fail
 msix:x64-osx=fail