From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 12 May 2021 01:49:18 +0000 (-0700)
Subject: remove work around for stateful macOS CI runners
X-Git-Tag: 2.47.2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=193839dc170da320b6eed21f23eff1b0d0379484;p=graphviz

remove work around for stateful macOS CI runners

Graphviz was part of a closed beta program for Gitlab macOS CI runners.¹ During
the beta period, Graphviz had access to a single macOS VM environment that was
stateful. That is, the effects of any macOS CI task would persist to the next
macOS CI task. To work around this, logic was introduced to manually remove the
Graphviz installed in the macOS CI environment by the prior run.

The Gitlab program will transition into open beta on 2021-05-22, however the
Graphviz configuration was already migrated to the open beta model on
2021-04-07.² This means the macOS runner are no longer stateful:

  To recap, for the closed beta, we provisioned a static macOS virtual machine
  for each project. This meant that we executed any pipeline job in your
  associated repository on the same virtual machine each time. Since the VM was
  dedicated to your project, this also meant that your pipeline job did not have
  to wait in a queue before running.

  For the open-beta, each job that requires a macOS build environment will run
  in its own ephemeral virtual machine provisioned on demand by the GitLab
  Runner macOS autoscaler. This means that you can’t rely on persistent storage
  anymore.

This change removes the work around that is no longer needed. This reverts
62165551efb389ea14a6709ffd89b2b5ed79e35c.

  ¹ https://gitlab.com/gitlab-com/macos-buildcloud-runners-beta/-/issues/3
  ² https://gitlab.com/gitlab-com/macos-buildcloud-runners-beta/-/issues/3#note_536852935
---

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index b1cd695dc..80bffc086 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -26,54 +26,7 @@ ARCH=$( uname -m )
 
 # Remove possible old version of Graphviz so that we can detect if
 # individual Graphviz tools are missing in the current release
-if [ "${ID}" = "Darwin" ]; then
-    # FIXME: Remove this when the macOS runner starts up clean.
-    # See https://gitlab.com/gitlab-com/macos-buildcloud-runners-beta/-/issues/3#note_434697680
-    rm -f \
-       /usr/local/bin/acyclic \
-       /usr/local/bin/bcomps \
-       /usr/local/bin/ccomps \
-       /usr/local/bin/circo \
-       /usr/local/bin/cluster \
-       /usr/local/bin/diffimg \
-       /usr/local/bin/dijkstra \
-       /usr/local/bin/dot \
-       /usr/local/bin/dot2gxl \
-       /usr/local/bin/dot_builtins \
-       /usr/local/bin/dotty \
-       /usr/local/bin/edgepaint \
-       /usr/local/bin/fdp \
-       /usr/local/bin/gc \
-       /usr/local/bin/gml2gv \
-       /usr/local/bin/graphml2gv \
-       /usr/local/bin/gv2gml \
-       /usr/local/bin/gv2gxl \
-       /usr/local/bin/gvcolor \
-       /usr/local/bin/gvedit \
-       /usr/local/bin/gvgen \
-       /usr/local/bin/gvmap \
-       /usr/local/bin/gvmap.sh \
-       /usr/local/bin/gvpack \
-       /usr/local/bin/gvpr \
-       /usr/local/bin/gxl2dot \
-       /usr/local/bin/gxl2gv \
-       /usr/local/bin/lefty \
-       /usr/local/bin/lneato \
-       /usr/local/bin/mingle \
-       /usr/local/bin/mm2gv \
-       /usr/local/bin/neato \
-       /usr/local/bin/nop \
-       /usr/local/bin/osage \
-       /usr/local/bin/patchwork \
-       /usr/local/bin/prune \
-       /usr/local/bin/sccmap \
-       /usr/local/bin/sfdp \
-       /usr/local/bin/smyrna \
-       /usr/local/bin/tred \
-       /usr/local/bin/twopi \
-       /usr/local/bin/unflatten \
-       /usr/local/bin/vimdot
-elif [ "${ID}" = "centos" -o "${ID}" = "fedora" ]; then
+if [ "${ID}" = "centos" -o "${ID}" = "fedora" ]; then
     # Both doxgen and asciidoc depend on graphviz and needs to be
     # removed to allow Graphviz to be removed
     if rpm -q doxygen; then