From 6a5c67dbdf072f626ccce432ab5419abfa68ba42 Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Mon, 4 May 2026 13:15:58 -0500
Subject: [PATCH] Remove enrollment profile policy and test label (#44683)

Delete the macOS policy 'enrollment-profile-up-to-date' and the 'Nudge
test devices' label, and remove their references from it-and-security
manifests. Files removed:
it-and-security/lib/macos/policies/enrollment-profile-up-to-date.yml and
it-and-security/lib/all/labels/nudge-test-devices.yml; references
dropped from it-and-security/default.yml,
it-and-security/fleets/testing-and-qa.yml, and
it-and-security/fleets/workstations.yml to avoid loading deleted
artifacts.
---
 it-and-security/default.yml                    |  1 -
 it-and-security/fleets/testing-and-qa.yml      |  1 -
 it-and-security/fleets/workstations.yml        |  1 -
 .../lib/all/labels/nudge-test-devices.yml      | 10 ----------
 .../policies/enrollment-profile-up-to-date.yml | 18 ------------------
 5 files changed, 31 deletions(-)
 delete mode 100644 it-and-security/lib/all/labels/nudge-test-devices.yml
 delete mode 100644 it-and-security/lib/macos/policies/enrollment-profile-up-to-date.yml

diff --git a/it-and-security/default.yml b/it-and-security/default.yml
index 294adeb737..4eb86364d7 100644
--- a/it-and-security/default.yml
+++ b/it-and-security/default.yml
@@ -110,7 +110,6 @@ labels:
   - path: ./lib/all/labels/windows-screen-lock-exclusions.yml
   - path: ./lib/all/labels/team-g-mdm.yml
   - path: ./lib/all/labels/team-g-software.yml
-  - path: ./lib/all/labels/nudge-test-devices.yml
   - path: ./lib/all/labels/macs-with-microsoft-autoupdate-installed.yml
   - path: ./lib/all/labels/macs-with-fleet-maintained-apps-installed.yml
   - path: ./lib/all/labels/macs-with-fleet-desktop-installed.yml
diff --git a/it-and-security/fleets/testing-and-qa.yml b/it-and-security/fleets/testing-and-qa.yml
index 79bc19475d..117f4017ff 100644
--- a/it-and-security/fleets/testing-and-qa.yml
+++ b/it-and-security/fleets/testing-and-qa.yml
@@ -82,7 +82,6 @@ controls:
     - path: ../lib/linux/scripts/install-fleet-desktop-required-extension.sh
 policies:
   # macOS policies
-  - path: ../lib/macos/policies/enrollment-profile-up-to-date.yml
   # Linux policies
   - path: ../lib/linux/policies/check-fleet-desktop-extension-enabled.yml
 reports:
diff --git a/it-and-security/fleets/workstations.yml b/it-and-security/fleets/workstations.yml
index d61d1eef57..90371599d1 100644
--- a/it-and-security/fleets/workstations.yml
+++ b/it-and-security/fleets/workstations.yml
@@ -155,7 +155,6 @@ policies:
   - path: ../lib/macos/policies/1password-emergency-kit-check.yml
   - path: ../lib/macos/policies/latest-macos.yml
   - path: ../lib/macos/policies/all-software-updates-installed.yml
-  - path: ../lib/macos/policies/enrollment-profile-up-to-date.yml
   - path: ../lib/macos/policies/disk-encryption-check.yml
   - path: ../lib/macos/policies/disk-space-check.yml
   # - path: ../lib/macos/policies/1password-installed.yml https://github.com/fleetdm/fleet/pull/44179
diff --git a/it-and-security/lib/all/labels/nudge-test-devices.yml b/it-and-security/lib/all/labels/nudge-test-devices.yml
deleted file mode 100644
index 71315f21f6..0000000000
--- a/it-and-security/lib/all/labels/nudge-test-devices.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: Nudge test devices
-  description: Macs testing Nudge
-  label_membership_type: manual
-  platform: darwin
-  hosts:
-    - "allens-macbook-pro.local"
-    - "allens-mac-mini.local"
-    - "noah-talerman-macBook-pro.local"
-    - "mitchs-macbook-pro.local"
-    - "harrisons-macbook-pro.local"
diff --git a/it-and-security/lib/macos/policies/enrollment-profile-up-to-date.yml b/it-and-security/lib/macos/policies/enrollment-profile-up-to-date.yml
deleted file mode 100644
index 98af3492ee..0000000000
--- a/it-and-security/lib/macos/policies/enrollment-profile-up-to-date.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- name: macOS - Enrollment profile up to date
-  query: |
-    SELECT 1 FROM mdm 
-    WHERE topic = "com.apple.mgmt.External.8a3367bf-49d7-4dc3-ae41-c9de95f7b424"
-       OR topic IS NULL 
-       OR topic = '';
-  critical: true
-  description: Recently we had to update files used for managing Apple devices. This policy checks to see if you have the most recent enrollment profile installed. Not having this profile means this device is no longer communicating with Fleet via MDM.
-  resolution: |-
-    You must manually remove your enrollment profile to fix this issue by following these steps: 
-
-     > System Settings > General > Device Management > Click on the profile "Fleet enrollment" followed by the "-" (minus) button 
-
-    After a few minutes, your device may initiate automatic re-enrollment. If it does not, open Fleet Desktop and follow the steps for manually enabling MDM. 
-
-    If you encounter any issues, please reach out via #help-dogfooding. 
-  platform: darwin
-  calendar_events_enabled: false