Revert adhoc-canaryyml and Modified omnibus-releasetest-mac-universal-binary

Signed-off-by: Poornima <94897054+poorndm@users.noreply.github.com>

2 files changed, 132 insertions, 132 deletions

diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml
index 467d2c7601..10617b5989 100644
--- a/.expeditor/adhoc-canary.omnibus.yml
+++ b/.expeditor/adhoc-canary.omnibus.yml
@@ -15,22 +15,22 @@ builder-to-testers-map:
   # aix-7.1-powerpc:
   #   - aix-7.1-powerpc
   #   - aix-7.2-powerpc
-  # amazon-2022-aarch64:
-  #   - amazon-2022-aarch64
-  # amazon-2022-x86_64:
-  #   - amazon-2022-x86_64
-  # debian-9-x86_64:
-  #   - debian-9-x86_64
-  #   - debian-10-x86_64
-  #   - debian-11-x86_64
-  # debian-10-aarch64:
-  #   - debian-10-aarch64
-  #   - debian-11-aarch64
-  # el-6-x86_64:
-  #   - el-6-x86_64
-  # el-7-aarch64:
-  #   - el-7-aarch64
-  #   - amazon-2-aarch64
+  amazon-2022-aarch64:
+    - amazon-2022-aarch64
+  amazon-2022-x86_64:
+    - amazon-2022-x86_64
+  debian-9-x86_64:
+    - debian-9-x86_64
+    - debian-10-x86_64
+    - debian-11-x86_64
+  debian-10-aarch64:
+    - debian-10-aarch64
+    - debian-11-aarch64
+  el-6-x86_64:
+    - el-6-x86_64
+  el-7-aarch64:
+    - el-7-aarch64
+    - amazon-2-aarch64
   # el-7-ppc64:
   #   - el-7-ppc64
   # el-7-ppc64le:
@@ -38,56 +38,56 @@ builder-to-testers-map:
   # el-7-s390x:
   #   - el-7-s390x
   #   - el-8-s390x
-  # el-7-x86_64:
-  #   - el-7-x86_64
-  #   - amazon-2-x86_64
-  # el-8-aarch64:
-  #   - el-8-aarch64
-  # el-8-x86_64:
-  #   - el-8-x86_64
-  # el-9-aarch64:
-  #   - el-9-aarch64
-  # el-9-x86_64:
-  #   - el-9-x86_64
-  # freebsd-12-amd64:
-  #   - freebsd-12-amd64
-  #   - freebsd-13-amd64
+  el-7-x86_64:
+    - el-7-x86_64
+    - amazon-2-x86_64
+  el-8-aarch64:
+    - el-8-aarch64
+  el-8-x86_64:
+    - el-8-x86_64
+  el-9-aarch64:
+    - el-9-aarch64
+  el-9-x86_64:
+    - el-9-x86_64
+  freebsd-12-amd64:
+    - freebsd-12-amd64
+    - freebsd-13-amd64
   mac_os_x-10.15-x86_64:
-  #  - mac_os_x-10.15-x86_64
+    - mac_os_x-10.15-x86_64
     - mac_os_x-11-x86_64
-  #  - mac_os_x-12-x86_64
+    - mac_os_x-12-x86_64
   mac_os_x-11-arm64:
     - mac_os_x-11-arm64
   #   - mac_os_x-12-arm64     canary org doesn't yet have a macos 12 arm64 omnibus worker
   # sles-12-s390x:
   #   - sles-12-s390x
   #   - sles-15-s390x
-  # sles-12-x86_64:
-  #   - sles-12-x86_64
-  #   - sles-15-x86_64
-  # sles-15-aarch64:
-  #   - sles-15-aarch64
+  sles-12-x86_64:
+    - sles-12-x86_64
+    - sles-15-x86_64
+  sles-15-aarch64:
+    - sles-15-aarch64
   # solaris2-5.11-i386:
   #   - solaris2-5.11-i386
   # solaris2-5.11-sparc:
   #   - solaris2-5.11-sparc
-  # ubuntu-18.04-aarch64:
-  #   - ubuntu-18.04-aarch64
-  #   - ubuntu-20.04-aarch64
-  #   - ubuntu-22.04-aarch64
-  # ubuntu-16.04-x86_64:
-  #   - ubuntu-16.04-x86_64
-  #   - ubuntu-18.04-x86_64
-  #   - ubuntu-20.04-x86_64
-  #   - ubuntu-22.04-x86_64
-  # windows-2012r2-i386:
-  #   - windows-2012r2-i386
-  # windows-2012r2-x86_64:
-  #   - windows-2012-x86_64
-  #   - windows-2012r2-x86_64
-  #   - windows-2016-x86_64
-  #   - windows-2019-x86_64
-  #   - windows-2022-x86_64
-  #   - windows-8-x86_64
-  #   - windows-10-x86_64
-  #   - windows-11-x86_64
+  ubuntu-18.04-aarch64:
+    - ubuntu-18.04-aarch64
+    - ubuntu-20.04-aarch64
+    - ubuntu-22.04-aarch64
+  ubuntu-16.04-x86_64:
+    - ubuntu-16.04-x86_64
+    - ubuntu-18.04-x86_64
+    - ubuntu-20.04-x86_64
+    - ubuntu-22.04-x86_64
+  windows-2012r2-i386:
+    - windows-2012r2-i386
+  windows-2012r2-x86_64:
+    - windows-2012-x86_64
+    - windows-2012r2-x86_64
+    - windows-2016-x86_64
+    - windows-2019-x86_64
+    - windows-2022-x86_64
+    - windows-8-x86_64
+    - windows-10-x86_64
+    - windows-11-x86_64
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 803798b7ae..f87f0230fa 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -11,82 +11,82 @@ fips-platforms:
 skip-artifactory-platforms:
   - freebsd-13-amd64
 builder-to-testers-map:
-  aix-7.1-powerpc:
-    - aix-7.1-powerpc
-    - aix-7.2-powerpc
-  amazon-2022-aarch64:
-    - amazon-2022-aarch64
-  amazon-2022-x86_64:
-    - amazon-2022-x86_64
-  debian-9-x86_64:
-    - debian-9-x86_64
-    - debian-10-x86_64
-    - debian-11-x86_64
-  debian-10-aarch64:
-    - debian-10-aarch64
-    - debian-11-aarch64
-  el-6-x86_64:
-    - el-6-x86_64
-  el-7-aarch64:
-    - el-7-aarch64
-    - amazon-2-aarch64
-  el-7-ppc64:
-    - el-7-ppc64
-  el-7-ppc64le:
-    - el-7-ppc64le
-  el-7-s390x:
-    - el-7-s390x
-    - el-8-s390x
-  el-7-x86_64:
-    - el-7-x86_64
-    - amazon-2-x86_64
-  el-8-aarch64:
-    - el-8-aarch64
-  el-8-x86_64:
-    - el-8-x86_64
-  el-9-aarch64:
-    - el-9-aarch64
-  el-9-x86_64:
-    - el-9-x86_64
-  freebsd-12-amd64:
-    - freebsd-12-amd64
-    - freebsd-13-amd64
+  # aix-7.1-powerpc:
+  #   - aix-7.1-powerpc
+  #   - aix-7.2-powerpc
+  # amazon-2022-aarch64:
+  #   - amazon-2022-aarch64
+  # amazon-2022-x86_64:
+  #   - amazon-2022-x86_64
+  # debian-9-x86_64:
+  #   - debian-9-x86_64
+  #   - debian-10-x86_64
+  #   - debian-11-x86_64
+  # debian-10-aarch64:
+  #   - debian-10-aarch64
+  #   - debian-11-aarch64
+  # el-6-x86_64:
+  #   - el-6-x86_64
+  # el-7-aarch64:
+  #   - el-7-aarch64
+  #   - amazon-2-aarch64
+  # el-7-ppc64:
+  #   - el-7-ppc64
+  # el-7-ppc64le:
+  #   - el-7-ppc64le
+  # el-7-s390x:
+  #   - el-7-s390x
+  #   - el-8-s390x
+  # el-7-x86_64:
+  #   - el-7-x86_64
+  #   - amazon-2-x86_64
+  # el-8-aarch64:
+  #   - el-8-aarch64
+  # el-8-x86_64:
+  #   - el-8-x86_64
+  # el-9-aarch64:
+  #   - el-9-aarch64
+  # el-9-x86_64:
+  #   - el-9-x86_64
+  # freebsd-12-amd64:
+  #   - freebsd-12-amd64
+  #   - freebsd-13-amd64
   mac_os_x-10.15-x86_64:
-    - mac_os_x-10.15-x86_64
+  #  - mac_os_x-10.15-x86_64
     - mac_os_x-11-x86_64
-    - mac_os_x-12-x86_64
+  #  - mac_os_x-12-x86_64
   mac_os_x-11-arm64:
     - mac_os_x-11-arm64
-    - mac_os_x-12-arm64
-  sles-12-s390x:
-    - sles-12-s390x
-    - sles-15-s390x
-  sles-12-x86_64:
-    - sles-12-x86_64
-    - sles-15-x86_64
-  sles-15-aarch64:
-    - sles-15-aarch64
-  solaris2-5.11-i386:
-    - solaris2-5.11-i386
-  solaris2-5.11-sparc:
-    - solaris2-5.11-sparc
-  ubuntu-18.04-aarch64:
-    - ubuntu-18.04-aarch64
-    - ubuntu-20.04-aarch64
-    - ubuntu-22.04-aarch64
-  ubuntu-16.04-x86_64:
-    - ubuntu-16.04-x86_64
-    - ubuntu-18.04-x86_64
-    - ubuntu-20.04-x86_64
-    - ubuntu-22.04-x86_64
-  windows-2012r2-i386:
-    - windows-2012r2-i386
-  windows-2012r2-x86_64:
-    - windows-2012-x86_64
-    - windows-2012r2-x86_64
-    - windows-2016-x86_64
-    - windows-2019-x86_64
-    - windows-2022-x86_64
-    - windows-8-x86_64
-    - windows-10-x86_64
-    - windows-11-x86_64
+  #  - mac_os_x-12-arm64
+  # sles-12-s390x:
+  #   - sles-12-s390x
+  #   - sles-15-s390x
+  # sles-12-x86_64:
+  #   - sles-12-x86_64
+  #   - sles-15-x86_64
+  # sles-15-aarch64:
+  #   - sles-15-aarch64
+  # solaris2-5.11-i386:
+  #   - solaris2-5.11-i386
+  # solaris2-5.11-sparc:
+  #   - solaris2-5.11-sparc
+  # ubuntu-18.04-aarch64:
+  #   - ubuntu-18.04-aarch64
+  #   - ubuntu-20.04-aarch64
+  #   - ubuntu-22.04-aarch64
+  # ubuntu-16.04-x86_64:
+  #   - ubuntu-16.04-x86_64
+  #   - ubuntu-18.04-x86_64
+  #   - ubuntu-20.04-x86_64
+  #   - ubuntu-22.04-x86_64
+  # windows-2012r2-i386:
+  #   - windows-2012r2-i386
+  # windows-2012r2-x86_64:
+  #   - windows-2012-x86_64
+  #   - windows-2012r2-x86_64
+  #   - windows-2016-x86_64
+  #   - windows-2019-x86_64
+  #   - windows-2022-x86_64
+  #   - windows-8-x86_64
+  #   - windows-10-x86_64
+  #   - windows-11-x86_64