update CI and test automation workflows to use smoke tests and improve cleanup conditions

Author: Vemarthula-Microsoft

.github/workflows/CI.yml

@@ -395,7 +395,7 @@ jobs:
 
 
   cleanup-deployment:
-    if: always()
+    if: "!cancelled()"
     needs: [deploy, e2e-test]
     runs-on: ubuntu-latest
     env:

.github/workflows/test-automation.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Run tests(1)
         id: test1
         run: |
-          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+          xvfb-run pytest -m smoke --html=report/report.html --self-contained-html
         working-directory: tests/e2e-test
         continue-on-error: true
 
@@ -61,7 +61,7 @@ jobs:
         id: test2
         if: ${{ steps.test1.outcome == 'failure' }}
         run: |
-          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+          xvfb-run pytest -m smoke --html=report/report.html --self-contained-html
         working-directory: tests/e2e-test
         continue-on-error: true
 
@@ -74,7 +74,7 @@ jobs:
         id: test3
         if: ${{ steps.test2.outcome == 'failure' }}
         run: |
-          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+          xvfb-run pytest -m smoke --html=report/report.html --self-contained-html
         working-directory: tests/e2e-test
 
       - name: Upload test report
@@ -83,7 +83,9 @@ jobs:
         if: ${{ !cancelled() }}
         with:
           name: test-report
-          path: tests/e2e-test/report/*
+          path: |
+            tests/e2e-test/report/*
+            tests/e2e-test/screenshots/*
 
       - name: Send Notification
         if: always()

tests/e2e-test/pytest.ini

@@ -4,3 +4,5 @@ log_cli_level = INFO
 log_file = logs/tests.log
 log_file_level = INFO
 addopts = -p no:warnings
+markers =
+    smoke: marks tests as smoke tests (deselect with '-m "not smoke"')