Update identity build machine for msal 3.7 from ubunto 18.04 to 20.04 (#25807)

scbedd · web-flow · commit 93056eb1b3ec · 2022-08-22T16:05:06.000-07:00
* update identity build machine for msal 3.7 from ubunto 18.04 to 20.04
* updating parse_requirements in inject_custom_reqs
diff --git a/scripts/devops_tasks/tox_harness.py b/scripts/devops_tasks/tox_harness.py
@@ -5,7 +5,6 @@
 import re
 import multiprocessing
 import glob
-import pdb
 
 if sys.version_info < (3, 0):
     from Queue import Queue
@@ -208,9 +207,11 @@ def inject_custom_reqs(file, injected_packages, package_dir):
         )
         with open(file, "r") as f:
             for line in f:
+                logging.info("Attempting to parse {}".format(line))
                 try:
                     parsed_req = [req for req in parse_requirements(line)]
-                except RequirementParseError as e:
+                except Exception as e:
+                    logging.error(e)
                     parsed_req = [None]
                 req_lines.append((line, parsed_req))
 
@@ -226,6 +227,8 @@ def inject_custom_reqs(file, injected_packages, package_dir):
         else:
             all_adjustments = injected_packages
 
+        logging.info("Generated Custom Reqs: {}".format(req_lines))
+
         with open(file, "w") as f:
             # note that we directly use '\n' here instead of os.linesep due to how f.write() actually handles this stuff internally
             # If a file is opened in text mode (the default), during write python will accidentally double replace due to "\r" being
diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json
@@ -8,9 +8,9 @@
   "include": [
     {
       "Config": {
-        "ubuntu_18.04_3.7_msal": {
-          "OSVmImage": "MMSUbuntu18.04",
-          "Pool": "azsdk-pool-mms-ubuntu-1804-general",
+        "ubuntu_20.04_3.7_msal": {
+          "OSVmImage": "MMSUbuntu20.04",
+          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
           "PythonVersion": "3.7",
           "CoverageArg": "--disablecov",
           "InjectedPackages": "git+https://github.com/AzureAD/microsoft-authentication-library-for-python@dev",
