Increase parallel test runs (#140)

Azure · Oct 28, 2022 · 345364c · 345364c
1 parent 0f14c41
commit 345364c
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 61 deletions.
diff --git a/azuredevops/Build-Update-Dev.yaml b/azuredevops/Build-Update-Dev.yaml
@@ -18,7 +18,7 @@ parameters:
 - name: workspaceWindowSeconds
   displayName: Workspace Active Window (seconds)
   type: number
-  default: 86000 # Just less than one day
+  default: 432000 # 5 days for trobleshooting
   # Specifies whether to remove workspaces
   # older than 2*worksapceWindowSeconds
 - name: oldWorkspaceHandling
@@ -65,7 +65,7 @@ variables:
   value: WorkspaceConfiguration
 
 pr:
-  - main
+  - current_release
 
 trigger: none # No CI build
 

diff --git a/azuredevops/PR-Gate.yaml b/azuredevops/PR-Gate.yaml
@@ -18,7 +18,7 @@ parameters:
 - name: workspaceWindowSeconds
   displayName: Workspace Active Window (seconds)
   type: number
-  default: 86000 # Just less than one day
+  default: 432000 # Just less than one day
   # Specifies whether to remove workspaces
   # older than 2*worksapceWindowSeconds
 - name: oldWorkspaceHandling

diff --git a/examples/notebooks/responsibleaidashboard-diabetes-decision-making.ipynb b/examples/notebooks/responsibleaidashboard-diabetes-decision-making.ipynb
@@ -57,7 +57,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "rai_diabetes_decision_making_example_version_string = '8'"
+    "rai_diabetes_decision_making_example_version_string = '1'"
    ]
   },
   {
@@ -379,9 +379,7 @@
     "    \n",
     "train_component_definition = load_component(\n",
     "    source=yaml_filename\n",
-    ")\n",
-    "\n",
-    "ml_client.components.create_or_update(train_component_definition)"
+    ")"
    ]
   },
   {
@@ -462,10 +460,7 @@
     "register_component = ml_client.components.get(\n",
     "    name=\"register_model\", version=version_string\n",
     ")\n",
-    "train_model_component = ml_client.components.get(\n",
-    "    name=\"rai_diabetes_decision_training_component\",\n",
-    "    version=rai_diabetes_decision_making_example_version_string\n",
-    ")\n",
+    "\n",
     "diabetes_train_pq = Input(\n",
     "    type=\"uri_file\",\n",
     "    path=f\"{input_train_data}:{rai_diabetes_decision_making_example_version_string}\",\n",
@@ -1058,7 +1053,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.8.13 64-bit",
+   "display_name": "Python 3.7.3 64-bit ('anaconda3')",
    "language": "python",
    "name": "python3"
   },
@@ -1072,11 +1067,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.7.3"
   },
   "vscode": {
    "interpreter": {
-    "hash": "8fd340b5477ca1a0b454d48a3973beff39fee032ada47a04f6f3725b469a8988"
+    "hash": "d7b9bea780a7c9857b8563ae025d5b613e23d6656044dfada28bd5ab49fcd8e3"
    }
   }
  },

diff --git a/examples/notebooks/responsibleaidashboard-diabetes-regression-model-debugging.ipynb b/examples/notebooks/responsibleaidashboard-diabetes-regression-model-debugging.ipynb
@@ -57,7 +57,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "rai_diabetes_regression_example_version_string = '6'"
+    "rai_diabetes_regression_example_version_string = '1'"
    ]
   },
   {
@@ -379,9 +379,7 @@
     "    \n",
     "train_component_definition = load_component(\n",
     "    source=yaml_filename\n",
-    ")\n",
-    "\n",
-    "ml_client.components.create_or_update(train_component_definition)"
+    ")"
    ]
   },
   {
@@ -462,9 +460,7 @@
     "register_component = ml_client.components.get(\n",
     "    name=\"register_model\", version=version_string\n",
     ")\n",
-    "train_model_component = ml_client.components.get(\n",
-    "    name=\"rai_diabetes_regression_training_component\", version=rai_diabetes_regression_example_version_string\n",
-    ")\n",
+    "\n",
     "diabetes_train_pq = Input(\n",
     "    type=\"uri_file\", path=f\"{input_train_data}:{rai_diabetes_regression_example_version_string}\", mode=\"download\"\n",
     ")\n",
@@ -1058,7 +1054,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.8.13 64-bit",
+   "display_name": "Python 3.7.3 64-bit ('anaconda3')",
    "language": "python",
    "name": "python3"
   },
@@ -1072,11 +1068,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.7.3"
   },
   "vscode": {
    "interpreter": {
-    "hash": "8fd340b5477ca1a0b454d48a3973beff39fee032ada47a04f6f3725b469a8988"
+    "hash": "d7b9bea780a7c9857b8563ae025d5b613e23d6656044dfada28bd5ab49fcd8e3"
    }
   }
  },

diff --git a/examples/notebooks/responsibleaidashboard-housing-classification-model-debugging.ipynb b/examples/notebooks/responsibleaidashboard-housing-classification-model-debugging.ipynb
@@ -61,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "rai_housing_example_version_string = '4'"
+    "rai_housing_example_version_string = '1'"
    ]
   },
   {
@@ -414,9 +414,7 @@
     "    \n",
     "train_component_definition = load_component(\n",
     "    source=yaml_filename\n",
-    ")\n",
-    "\n",
-    "ml_client.components.create_or_update(train_component_definition)"
+    ")"
    ]
   },
   {
@@ -497,9 +495,6 @@
     "register_component = ml_client.components.get(\n",
     "    name=\"register_model\", version=version_string\n",
     ")\n",
-    "train_model_component = ml_client.components.get(\n",
-    "    name=\"rai_housing_training_component\", version=rai_housing_example_version_string\n",
-    ")\n",
     "\n",
     "housing_train_pq = Input(\n",
     "    type=\"uri_file\", path=f\"{input_train_data}:{rai_housing_example_version_string}\", mode=\"download\"\n",
@@ -909,7 +904,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.8.13 64-bit ('responsibleai-0.18')",
+   "display_name": "Python 3.7.3 64-bit ('anaconda3')",
    "language": "python",
    "name": "python3"
   },
@@ -923,11 +918,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.7.3"
   },
   "vscode": {
    "interpreter": {
-    "hash": "8fd340b5477ca1a0b454d48a3973beff39fee032ada47a04f6f3725b469a8988"
+    "hash": "d7b9bea780a7c9857b8563ae025d5b613e23d6656044dfada28bd5ab49fcd8e3"
    }
   }
  },

diff --git a/examples/notebooks/responsibleaidashboard-housing-decision-making.ipynb b/examples/notebooks/responsibleaidashboard-housing-decision-making.ipynb
@@ -55,7 +55,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "rai_house_improvement_version_string = '16'"
+    "rai_house_improvement_version_string = '1'"
    ]
   },
   {
@@ -413,9 +413,7 @@
     "    \n",
     "train_component_definition = load_component(\n",
     "    source=yaml_filename\n",
-    ")\n",
-    "\n",
-    "ml_client.components.create_or_update(train_component_definition)"
+    ")"
    ]
   },
   {
@@ -496,9 +494,6 @@
     "register_component = ml_client.components.get(\n",
     "    name=\"register_model\", version=version_string\n",
     ")\n",
-    "train_model_component = ml_client.components.get(\n",
-    "    name=\"rai_dummy_training_component\", version=rai_house_improvement_version_string\n",
-    ")\n",
     "housing_improvement_train_pq = Input(\n",
     "    type=\"uri_file\", path=f\"{input_train_data}:{rai_house_improvement_version_string}\", mode=\"download\"\n",
     ")\n",
@@ -878,7 +873,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.8.13 64-bit",
+   "display_name": "Python 3.7.3 64-bit ('anaconda3')",
    "language": "python",
    "name": "python3"
   },
@@ -892,11 +887,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.7.3"
   },
   "vscode": {
    "interpreter": {
-    "hash": "8fd340b5477ca1a0b454d48a3973beff39fee032ada47a04f6f3725b469a8988"
+    "hash": "d7b9bea780a7c9857b8563ae025d5b613e23d6656044dfada28bd5ab49fcd8e3"
    }
   }
  },

diff --git a/examples/notebooks/responsibleaidashboard-programmer-regression-model-debugging.ipynb b/examples/notebooks/responsibleaidashboard-programmer-regression-model-debugging.ipynb
@@ -55,7 +55,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "rai_programmer_example_version_string = '5'"
+    "rai_programmer_example_version_string = '1'"
    ]
   },
   {
@@ -410,9 +410,7 @@
     "    \n",
     "train_component_definition = load_component(\n",
     "    source=yaml_filename\n",
-    ")\n",
-    "\n",
-    "ml_client.components.create_or_update(train_component_definition)"
+    ")"
    ]
   },
   {
@@ -491,9 +489,6 @@
     "register_component = ml_client.components.get(\n",
     "    name=\"register_model\", version=version_string\n",
     ")\n",
-    "train_model_component = ml_client.components.get(\n",
-    "    name=\"rai_programmers_training_component\", version=rai_programmer_example_version_string\n",
-    ")\n",
     "programmers_train_mltable = Input(\n",
     "    type=\"mltable\", path=f\"{input_train_data}:{rai_programmer_example_version_string}\", mode=\"download\"\n",
     ")\n",
@@ -1068,7 +1063,7 @@
  "metadata": {
   "celltoolbar": "Raw Cell Format",
   "kernelspec": {
-   "display_name": "Python 3.8.13 64-bit",
+   "display_name": "Python 3.7.3 64-bit ('anaconda3')",
    "language": "python",
    "name": "python3"
   },
@@ -1082,11 +1077,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.7.3"
   },
   "vscode": {
    "interpreter": {
-    "hash": "8fd340b5477ca1a0b454d48a3973beff39fee032ada47a04f6f3725b469a8988"
+    "hash": "d7b9bea780a7c9857b8563ae025d5b613e23d6656044dfada28bd5ab49fcd8e3"
    }
   }
  },

diff --git a/scripts/Run-E2E-Tests.ps1 b/scripts/Run-E2E-Tests.ps1
@@ -2,4 +2,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
 
-python -m pytest -n 3 ./test/  -m "not notebooks" -o junit_family=xunit2 --junitxml=junit.xml
+python -m pytest -n 10 ./test/  -m "not notebooks" -o junit_family=xunit2 --junitxml=junit.xml
diff --git a/scripts/Run-Notebook-Tests.ps1 b/scripts/Run-Notebook-Tests.ps1
@@ -2,4 +2,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
 
-python -m pytest -n 3 ./test/  -m "notebooks" -o junit_family=xunit2 --junitxml=junit.xml
+python -m pytest -n 5 ./test/  -m "notebooks" -o junit_family=xunit2 --junitxml=junit.xml
diff --git a/test/notebooks/test_notebooks.py b/test/notebooks/test_notebooks.py
@@ -54,7 +54,7 @@ def test_responsibleaidashboard_housing_classification_model_debugging(
     replacements = dict()
     replacements["version_string = '1'"] = f"version_string = '{version_string}'"
     replacements[
-        "rai_housing_example_version_string = '4'"
+        "rai_housing_example_version_string = '1'"
     ] = f"rai_housing_example_version_string = '{train_version_string}'"
     replacements[
         "data_path = 'data/apartments-train.csv'"
@@ -81,7 +81,7 @@ def test_responsibleaidashboard_housing_improvement(
     replacements = dict()
     replacements["version_string = '1'"] = f"version_string = '{version_string}'"
     replacements[
-        "rai_house_improvement_version_string = '16'"
+        "rai_house_improvement_version_string = '1'"
     ] = f"rai_house_improvement_version_string = '{train_version_string}'"
     replacements[
         "data_path = 'data/apartments-train.csv'"
@@ -109,7 +109,7 @@ def test_responsibleaidashboard_programmer_regression_model_debugging(
     replacements = dict()
     replacements["version_string = '1'"] = f"version_string = '{version_string}'"
     replacements[
-        "rai_programmer_example_version_string = '5'"
+        "rai_programmer_example_version_string = '1'"
     ] = f"rai_programmer_example_version_string = '{train_version_string}'"
     replacements[
         f"train_data_path = '{train_path}'"
@@ -133,7 +133,7 @@ def test_responsibleaidashboard_diabetes_regression_model_debugging(
     replacements = dict()
     replacements["version_string = '1'"] = f"version_string = '{version_string}'"
     replacements[
-        "rai_diabetes_regression_example_version_string = '6'"
+        "rai_diabetes_regression_example_version_string = '1'"
     ] = f"rai_diabetes_regression_example_version_string = '{train_version_string}'"
 
     assay_one_notebook(nb_name, dict(), replacements)
@@ -151,7 +151,7 @@ def test_responsibleaidashboard_diabetes_decision_making(
     replacements = dict()
     replacements["version_string = '1'"] = f"version_string = '{version_string}'"
     replacements[
-        "rai_diabetes_decision_making_example_version_string = '8'"
+        "rai_diabetes_decision_making_example_version_string = '1'"
     ] = f"rai_diabetes_decision_making_example_version_string = '{train_version_string}'"
 
     assay_one_notebook(nb_name, dict(), replacements)