Merge pull request #430 from microsoft/staging

Update master

README.md

@@ -1,3 +1,6 @@
+<img src="scenarios/media/logo_cvbp.png" align="right" alt="" width="300"/>
+
+
 # Computer Vision
 
 In recent years, we've see an extra-ordinary growth in Computer Vision, with applications in face recognition, image understanding, search, drones, mapping, semi-autonomous and autonomous vehicles. A key part to many of these applications are visual recognition tasks such as image classification, object detection and image similarity. 

tests/.ci/AML-nightly-gpu.yml

@@ -100,7 +100,7 @@ jobs:
       pip install paramiko==2.4.2;
       pip install --upgrade azureml-sdk;
       pip install azure-cli;
-      python .ci/submit_azureml_pytest.py --subid $(subscriptionid) --test $(test) --testfolder $(testfolder) --condafile $(condafile) --testmarkers $(testmarkers) --clustername $(clustername) --expname $(expname) --dockerproc $(dockerproc) --junitxml $(junitxml) --reponame $(Build.Repository.Name) --branch $(Build.SourceBranchName) --pr $(prtag) --rg $(rg) --wsname $(wsname)
+      python tests/.ci/submit_azureml_pytest.py --subid $(subscriptionid) --test $(test) --testfolder $(testfolder) --condafile $(condafile) --testmarkers $(testmarkers) --clustername $(clustername) --expname $(expname) --dockerproc $(dockerproc) --junitxml $(junitxml) --reponame $(Build.Repository.Name) --branch $(Build.SourceBranchName) --pr $(prtag) --rg $(rg) --wsname $(wsname)
     displayName: 'submit_azureml_pytest'
   
   - task: PublishTestResults@2

tests/.ci/azure-pipeline-azureml-notebook-test.yml

@@ -41,7 +41,7 @@ jobs:
   - bash: |
       source activate cv
       python -m ipykernel install --user --name cv --display-name "cv"
-      pytest -q --subscription_id=$(subscriptionid) --resource_group=$(resource_group) --workspace_name=$(workspace_name) --workspace_region=$(workspace_region) --junitxml $(junitxml) -m azuremlnotebooks
+      pytest -q --ignore=contrib --subscription_id=$(subscriptionid) --resource_group=$(resource_group) --workspace_name=$(workspace_name) --workspace_region=$(workspace_region) --junitxml $(junitxml) -m azuremlnotebooks
     displayName: 'Run AzureML notebook tests'
   
   - bash: |

tests/.ci/run_pytest.py

@@ -69,6 +69,7 @@ if __name__ == "__main__":
     logger.debug("junit= --junitxml={}".format(args.xmlname))
     pytest_cmd = [
         "pytest",
+        "--ignore=contrib",
         args.testfolder,
         "-m",
         args.testmarkers,

tests/.ci/submit_azureml_pytest.py

@@ -264,7 +264,7 @@ def create_arg_parser():
     parser.add_argument(
         "--test",
         action="store",
-        default=".ci/run_pytest.py",
+        default="tests/.ci/run_pytest.py",
         help="location of script to run pytest",
     )
     # test folder

tests/smoke/test_azureml_notebooks.py

@@ -180,7 +180,7 @@ def test_od_20_notebook_run(
     workspace_name,
     workspace_region,
 ):
-    notebook_path = classification_notebooks["20_deployment_on_kubernetes"]
+    notebook_path = detection_notebooks["20_deployment_on_kubernetes"]
     pm.execute_notebook(
         notebook_path,
         OUTPUT_NOTEBOOK,