From c0ffb8b954fc8e0f6433a7d62e4e10b11c939825 Mon Sep 17 00:00:00 2001
From: shivamcandela <shivam.thakur@candelatech.com>
Date: Sun, 4 Jul 2021 21:50:36 +0530
Subject: [PATCH 1/4] Added Option for AP Build URL and sanity marker moved to
 'sanity and not interop'

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
---
 .github/workflows/sanity.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index e8670d976..99ac02650 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -27,6 +27,10 @@ on:
         default: 'sanity'
         description: 'Pytest marker expression that will be used to select the tests to execute'
         required: false
+      build_url:
+        default: '0'
+        description: 'Option for AP Firmware build url'
+        required: false
   schedule:
   - cron: '15 0 * * *'
 
@@ -183,7 +187,7 @@ jobs:
                   - -c
                   - |
                     cd tests
-                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results
+                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity and not interop' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results -o --build=${{ github.event.inputs.build_url }}
                     ret=\$?
                     # sleep some time to be able to download the Allure results
                     sleep 60

From fc5bcf8cab66e4effc5a36b8c0d19a1227d2727b Mon Sep 17 00:00:00 2001
From: Shivam Thakur <70829776+shivamcandela@users.noreply.github.com>
Date: Mon, 5 Jul 2021 16:40:29 +0530
Subject: [PATCH 2/4] Fixed build url for automatic execution

Given fallback value for automatic execution
---
 .github/workflows/sanity.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 99ac02650..7b213c5f3 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -187,7 +187,7 @@ jobs:
                   - -c
                   - |
                     cd tests
-                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity and not interop' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results -o --build=${{ github.event.inputs.build_url }}
+                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity and not interop' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results -o --build=${{ github.event.inputs.build_url || "0"}}
                     ret=\$?
                     # sleep some time to be able to download the Allure results
                     sleep 60

From 28dcaf7e6cb51a2292fe70ce39dc365754434b5a Mon Sep 17 00:00:00 2001
From: Shivam Thakur <70829776+shivamcandela@users.noreply.github.com>
Date: Mon, 5 Jul 2021 16:42:24 +0530
Subject: [PATCH 3/4] marker adjustments in if conditions

---
 .github/workflows/sanity.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 7b213c5f3..9fc4790a3 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -307,13 +307,13 @@ jobs:
         path: allure-report
     
     - name: copy new report
-      if: ${{ (github.event.inputs.marker_expression || 'sanity') == 'sanity' }}
+      if: ${{ (github.event.inputs.marker_expression || 'sanity') == 'sanity and not interop' }}
       run: |
         mkdir -p reports/sanity/${{ matrix.testbed }}
         cp -Tr allure-report reports/sanity/${{ matrix.testbed }}/${{ github.run_number }}
 
     - name: update latest symlink
-      if: ${{ (github.event.inputs.marker_expression || 'sanity') == 'sanity' }}
+      if: ${{ (github.event.inputs.marker_expression || 'sanity') == 'sanity and not interop' }}
       working-directory: reports/sanity/${{ matrix.testbed }}
       run: ln -fns ${{ github.run_number }} latest
 

From 1a829bbba6cc48ecb43b906d8033b792d8313af8 Mon Sep 17 00:00:00 2001
From: Shivam Thakur <70829776+shivamcandela@users.noreply.github.com>
Date: Tue, 6 Jul 2021 00:11:40 +0530
Subject: [PATCH 4/4] Update sanity.yml

---
 .github/workflows/sanity.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 9fc4790a3..a634bda00 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -27,9 +27,9 @@ on:
         default: 'sanity'
         description: 'Pytest marker expression that will be used to select the tests to execute'
         required: false
-      build_url:
-        default: '0'
-        description: 'Option for AP Firmware build url'
+      ap_firmware_url:
+        default: 'null'
+        description: 'Option for adding AP Firmware Image: <URL to File> from JFrog, takes from configuration.py when it is null'
         required: false
   schedule:
   - cron: '15 0 * * *'
@@ -187,7 +187,7 @@ jobs:
                   - -c
                   - |
                     cd tests
-                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity and not interop' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results -o --build=${{ github.event.inputs.build_url || "0"}}
+                    pytest -m "${{ github.event.inputs.marker_expression || 'sanity and not interop' }}" -s -vvv --testbed="${{ matrix.testbed }}" --skip-testrail --alluredir=/tmp/allure-results -o --build=${{ github.event.inputs.ap_firmware_url || "null"}}
                     ret=\$?
                     # sleep some time to be able to download the Allure results
                     sleep 60