From 2c6f05759b436c39a39bba4861ed3581e4927678 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:59:50 -0800
Subject: [PATCH 01/14] Disable job Test ubuntu2004_pypy39

---
 sdk/ai/azure-ai-projects/platform-matrix.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 sdk/ai/azure-ai-projects/platform-matrix.json

diff --git a/sdk/ai/azure-ai-projects/platform-matrix.json b/sdk/ai/azure-ai-projects/platform-matrix.json
new file mode 100644
index 000000000000..cba1927e3cc9
--- /dev/null
+++ b/sdk/ai/azure-ai-projects/platform-matrix.json
@@ -0,0 +1,8 @@
+{
+  "matrix": {
+    "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json"
+  },
+  "exclude": [
+    { "PyPyConfig": "ubuntu2004_pypy39" }
+  ]
+}

From d6669ae63b95503b99b0fe100082798ca69bb3c4 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 20:18:54 -0800
Subject: [PATCH 02/14] Try putting it at the service level folder

---
 sdk/ai/{azure-ai-projects => }/platform-matrix.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sdk/ai/{azure-ai-projects => }/platform-matrix.json (100%)

diff --git a/sdk/ai/azure-ai-projects/platform-matrix.json b/sdk/ai/platform-matrix.json
similarity index 100%
rename from sdk/ai/azure-ai-projects/platform-matrix.json
rename to sdk/ai/platform-matrix.json

From a7dc5977057c8df9b355353fe80fa2be81f4ce62 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 21:21:21 -0800
Subject: [PATCH 03/14] Try something else

---
 sdk/ai/ci.yml               | 2 ++
 sdk/ai/platform-matrix.json | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 sdk/ai/platform-matrix.json

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index 613dfe7015f5..e59a598e2d33 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -32,6 +32,8 @@ extends:
     TestProxy: true
     BuildDocs: true
     TestTimeoutInMinutes: 60
+    MatrixFilters:
+      - PythonVersion=^(?!pypy3).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:
     # This is a short term solution to create API review for python azure-ml package only when running pipeline manually
     # Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.
diff --git a/sdk/ai/platform-matrix.json b/sdk/ai/platform-matrix.json
deleted file mode 100644
index cba1927e3cc9..000000000000
--- a/sdk/ai/platform-matrix.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "matrix": {
-    "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json"
-  },
-  "exclude": [
-    { "PyPyConfig": "ubuntu2004_pypy39" }
-  ]
-}

From 3756dd3fcebd532d601b96a190a360a9e40765aa Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 21:49:27 -0800
Subject: [PATCH 04/14] Try again...

---
 sdk/ai/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index e59a598e2d33..aaa425b626a4 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -33,7 +33,7 @@ extends:
     BuildDocs: true
     TestTimeoutInMinutes: 60
     MatrixFilters:
-      - PythonVersion=^(?!pypy3).*
+      - PythonVersion=^(?!.*pypy3\.9).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:
     # This is a short term solution to create API review for python azure-ml package only when running pipeline manually
     # Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.

From 802a39e2477ce39fadf530a130b5cf8161495255 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:34:20 -0800
Subject: [PATCH 05/14] Try again

---
 sdk/ai/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index aaa425b626a4..ae3e0c700566 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -25,6 +25,10 @@ pr:
     - sdk/ai/
     - sdk/core/
 
+parameters:
+  MatrixFilters:
+    - PythonVersion=^(?!.*pypy3\.9).*
+
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:

From 8d6c96639485999547dac60fa41a36668be635c3 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:36:10 -0800
Subject: [PATCH 06/14] And again

---
 sdk/ai/ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index ae3e0c700566..1af7c46a2c75 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -25,9 +25,6 @@ pr:
     - sdk/ai/
     - sdk/core/
 
-parameters:
-  MatrixFilters:
-    - PythonVersion=^(?!.*pypy3\.9).*
 
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -37,7 +34,7 @@ extends:
     BuildDocs: true
     TestTimeoutInMinutes: 60
     MatrixFilters:
-      - PythonVersion=^(?!.*pypy3\.9).*
+      - PythonVersion=^(?!.*pypy39).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:
     # This is a short term solution to create API review for python azure-ml package only when running pipeline manually
     # Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.

From c0c9353a328756d7503c62adfe80d3e89951f08f Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:40:34 -0800
Subject: [PATCH 07/14] Add comment

---
 sdk/ai/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index 1af7c46a2c75..f25df0974f98 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -33,6 +33,9 @@ extends:
     TestProxy: true
     BuildDocs: true
     TestTimeoutInMinutes: 60
+    # Temporarily disable test job with pypy3.9 to unblock the first beta
+    # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
+    # pipeline hangs and eventually times out.
     MatrixFilters:
       - PythonVersion=^(?!.*pypy39).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:

From ab733341467c79a52090e8f0b3b7419a00f3a1d2 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:53:32 -0800
Subject: [PATCH 08/14] More

---
 sdk/ai/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index f25df0974f98..0ad8e2236f78 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -25,6 +25,12 @@ pr:
     - sdk/ai/
     - sdk/core/
 
+parameters:
+  # Temporarily disable test job with pypy3.9 to unblock the first beta
+  # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
+  # pipeline hangs and eventually times out.
+  MatrixFilters:
+    - PythonVersion=^(?!.*pypy39).*
 
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml

From e19d7b7ea4f8830c7a25add57ffd758bd71c9f7a Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:57:00 -0800
Subject: [PATCH 09/14] Try test.yml

---
 sdk/ai/ci.yml    | 11 -----------
 sdk/ai/tests.yml |  5 +++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index 0ad8e2236f78..738b05642b1f 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -25,12 +25,6 @@ pr:
     - sdk/ai/
     - sdk/core/
 
-parameters:
-  # Temporarily disable test job with pypy3.9 to unblock the first beta
-  # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
-  # pipeline hangs and eventually times out.
-  MatrixFilters:
-    - PythonVersion=^(?!.*pypy39).*
 
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -39,11 +33,6 @@ extends:
     TestProxy: true
     BuildDocs: true
     TestTimeoutInMinutes: 60
-    # Temporarily disable test job with pypy3.9 to unblock the first beta
-    # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
-    # pipeline hangs and eventually times out.
-    MatrixFilters:
-      - PythonVersion=^(?!.*pypy39).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:
     # This is a short term solution to create API review for python azure-ml package only when running pipeline manually
     # Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.
diff --git a/sdk/ai/tests.yml b/sdk/ai/tests.yml
index 960b65f98853..80f15ebd5e98 100644
--- a/sdk/ai/tests.yml
+++ b/sdk/ai/tests.yml
@@ -5,3 +5,8 @@ extends:
     template: /eng/pipelines/templates/stages/python-analyze-weekly-standalone.yml
     parameters:
       ServiceDirectory: ai
+      # Temporarily disable test job with pypy3.9 to unblock the first beta
+      # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
+      # pipeline hangs and eventually times out.
+      MatrixFilters:
+        - PythonVersion=^(?!.*pypy39).*

From d652691684c37a51f1c60bdf33292c14af9daf1e Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:58:14 -0800
Subject: [PATCH 10/14] Remove blank line

---
 sdk/ai/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index 738b05642b1f..613dfe7015f5 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -25,7 +25,6 @@ pr:
     - sdk/ai/
     - sdk/core/
 
-
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:

From d47534b8efac4881dd5d045851a0a2a63b18f164 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:22:36 -0800
Subject: [PATCH 11/14] Another attempt

---
 sdk/ai/tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk/ai/tests.yml b/sdk/ai/tests.yml
index 80f15ebd5e98..1021ec8083f6 100644
--- a/sdk/ai/tests.yml
+++ b/sdk/ai/tests.yml
@@ -1,8 +1,7 @@
 trigger: none
 
-# NOTE: Service live tests are NOT enabled. This file only enables the analyze stage currently.
 extends:
-    template: /eng/pipelines/templates/stages/python-analyze-weekly-standalone.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: ai
       # Temporarily disable test job with pypy3.9 to unblock the first beta

From 8ea40b5b252c5c894c74edae56e79e4c9c75d695 Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:35:38 -0800
Subject: [PATCH 12/14] And again...

---
 sdk/ai/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/ai/tests.yml b/sdk/ai/tests.yml
index 1021ec8083f6..87714657e213 100644
--- a/sdk/ai/tests.yml
+++ b/sdk/ai/tests.yml
@@ -8,4 +8,4 @@ extends:
       # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
       # pipeline hangs and eventually times out.
       MatrixFilters:
-        - PythonVersion=^(?!.*pypy39).*
+        - PythonVersion=^(?!pypy3).*

From 1034fda65fe8298c4125cb8cba7259e4dff50aba Mon Sep 17 00:00:00 2001
From: Darren Cohen <39422044+dargilco@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:18:30 -0800
Subject: [PATCH 13/14] Try again

---
 sdk/ai/ci.yml    | 4 ++++
 sdk/ai/tests.yml | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sdk/ai/ci.yml b/sdk/ai/ci.yml
index 613dfe7015f5..5b839a88424f 100644
--- a/sdk/ai/ci.yml
+++ b/sdk/ai/ci.yml
@@ -32,6 +32,10 @@ extends:
     TestProxy: true
     BuildDocs: true
     TestTimeoutInMinutes: 60
+    # The job "Test ubuntu2004_pypy39" in the "python - ai" pipeline hangs and eventually times out.
+    # Disable it until the issue is understood.
+    MatrixFilters:
+      - PythonVersion=^(?!pypy3).*
     # The below were set before when azure-ai-generative and azure-ai-resources packages were built:
     # This is a short term solution to create API review for python azure-ml package only when running pipeline manually
     # Long term solution should be to have different versions on main branch and release branch for python package so APIView can have different revisions for each version.
diff --git a/sdk/ai/tests.yml b/sdk/ai/tests.yml
index 87714657e213..397c8778300d 100644
--- a/sdk/ai/tests.yml
+++ b/sdk/ai/tests.yml
@@ -1,11 +1,8 @@
 trigger: none
 
+# NOTE: Service live tests are NOT enabled. This file only enables the analyze stage currently.
 extends:
-    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/python-analyze-weekly-standalone.yml
     parameters:
       ServiceDirectory: ai
-      # Temporarily disable test job with pypy3.9 to unblock the first beta
-      # release of azure-ai-projects. Otherwise, the job "Test ubuntu2004_pypy39" in the "python - ai"
-      # pipeline hangs and eventually times out.
-      MatrixFilters:
-        - PythonVersion=^(?!pypy3).*
+

From 1fabfdc77de8beff4aac3d33befadbe7b7114962 Mon Sep 17 00:00:00 2001
From: Scott Beddall <scbedd@microsoft.com>
Date: Fri, 15 Nov 2024 10:37:30 -0800
Subject: [PATCH 14/14] ensure pypy doesn't run against azure-ai-projects

---
 tools/azure-sdk-tools/ci_tools/functions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/azure-sdk-tools/ci_tools/functions.py b/tools/azure-sdk-tools/ci_tools/functions.py
index 536bc984d3d9..8db05e226ce8 100644
--- a/tools/azure-sdk-tools/ci_tools/functions.py
+++ b/tools/azure-sdk-tools/ci_tools/functions.py
@@ -52,6 +52,7 @@
     "azure-storage-file-share": "pypy",
     "azure-eventhub": "pypy",
     "azure-servicebus": "pypy",
+    "azure-ai-projects": "pypy",
 }
 
 omit_regression = (