Add pre-merge tag

Signed-off-by: Mariia Azbeleva <[email protected]>
tiiuae · Nov 25, 2024 · a4f253f · a4f253f
1 parent 9cc1326
commit a4f253f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/Robot-Framework/test-suites/bat-tests/apps.robot b/Robot-Framework/test-suites/bat-tests/apps.robot
@@ -18,7 +18,7 @@ Suite Teardown      Close All Connections
 
 Start Firefox
     [Documentation]   Start Firefox and verify process started
-    [Tags]            bat   SP-T41  nuc  orin-agx
+    [Tags]            bat   pre-merge   SP-T41  nuc  orin-agx
     [Setup]           Skip If   "${JOB}" == "nvidia-jetson-orin-agx-debug-nodemoapps-from-x86_64.x86_64-linux"
     ...               Skipped because this build doesn't contain applications
     Connect
@@ -28,7 +28,7 @@ Start Firefox
 
 Start Chrome on LenovoX1
     [Documentation]   Start Chrome in dedicated VM and verify process started
-    [Tags]            bat   SP-T92   lenovo-x1
+    [Tags]            bat   pre-merge   SP-T92   lenovo-x1
     Verify service status  range=15  [email protected]  expected_status=active  expected_state=running
     Connect to netvm
     Connect to VM       ${GUI_VM}
@@ -40,7 +40,7 @@ Start Chrome on LenovoX1
 
 Start Zathura on LenovoX1
     [Documentation]   Start Zathura in dedicated VM and verify process started
-    [Tags]            bat   SP-T105   lenovo-x1
+    [Tags]            bat   pre-merge   SP-T105   lenovo-x1
     [Setup]           Connect to netvm
     Connect to VM       ${GUI_VM}
     Check if ssh is ready on vm    ${ZATHURA_VM}
@@ -53,7 +53,7 @@ Start Zathura on LenovoX1
 
 Start Gala on LenovoX1
     [Documentation]   Start Gala in dedicated VM and verify process started
-    [Tags]            bat   SP-T104   lenovo-x1
+    [Tags]            bat   pre-merge   SP-T104   lenovo-x1
     [Setup]           Connect to netvm
     Connect to VM       ${GUI_VM}
     Check if ssh is ready on vm    ${GALA_VM}
@@ -64,7 +64,7 @@ Start Gala on LenovoX1
 
 Start Element on LenovoX1
     [Documentation]   Start Element in dedicated VM and verify process started
-    [Tags]            bat   SP-T52   lenovo-x1
+    [Tags]            bat   pre-merge   SP-T52   lenovo-x1
     [Setup]           Connect to netvm
     Connect to VM          ${GUI_VM}
     Check if ssh is ready on vm    ${COMMS_VM}
@@ -75,7 +75,7 @@ Start Element on LenovoX1
 
 Start Slack on LenovoX1
     [Documentation]   Start Slack in dedicated VM and verify process started
-    [Tags]            bat   SP-T181   lenovo-x1
+    [Tags]            bat   pre-merge   SP-T181   lenovo-x1
     [Setup]           Connect to netvm
     Connect to VM          ${GUI_VM}
     Check if ssh is ready on vm    ${COMMS_VM}

diff --git a/Robot-Framework/test-suites/bat-tests/business_vm.robot b/Robot-Framework/test-suites/bat-tests/business_vm.robot
@@ -3,7 +3,7 @@
 
 *** Settings ***
 Documentation       Testing Business VM
-Force Tags          bat  businessvm  lenovo-x1
+Force Tags          bat   pre-merge  businessvm  lenovo-x1
 Resource            ../../resources/ssh_keywords.resource
 Resource            ../../resources/virtualization_keywords.resource
 Resource            ../../config/variables.robot

diff --git a/Robot-Framework/test-suites/bat-tests/netvm.robot b/Robot-Framework/test-suites/bat-tests/netvm.robot
@@ -21,15 +21,15 @@ ${netvm_ssh}       ${EMPTY}
 
 Verify NetVM is started
     [Documentation]         Verify that NetVM is active and running
-    [Tags]                  bat   SP-T45  nuc  orin-agx  orin-nx  lenovo-x1
+    [Tags]                  bat   pre-merge   SP-T45  nuc  orin-agx  orin-nx  lenovo-x1
     [Setup]                 Connect to ghaf host
     Verify service status   service=${netvm_service}
     Check Network Availability      ${netvm_ip}    expected_result=True    range=5
     [Teardown]              Close All Connections
 
 Wifi passthrought into NetVM
     [Documentation]     Verify that wifi works inside netvm
-    [Tags]              bat   SP-T101   SP-T111  orin-agx  lenovo-x1
+    [Tags]              bat   pre-merge   SP-T101   SP-T111  orin-agx  lenovo-x1
     [Setup]             Run Keywords
     ...                 Connect to ghaf host  AND  Connect to netvm
     Configure wifi      ${netvm_ssh}  ${TEST_WIFI_SSID}  ${TEST_WIFI_PSWD}
@@ -43,14 +43,14 @@ Wifi passthrought into NetVM
 
 NetVM stops and starts successfully
     [Documentation]     Verify that NetVM stops properly and starts after that
-    [Tags]              bat   SP-T47  SP-T90  nuc  orin-nx  lenovo-x1
+    [Tags]              bat   pre-merge   SP-T47  SP-T90  nuc  orin-nx  lenovo-x1
     [Setup]     Connect to ghaf host
     Restart NetVM
     [Teardown]  Run Keywords  Start NetVM if dead   AND  Close All Connections
 
 NetVM is wiped after restarting
     [Documentation]     Verify that created file will be removed after restarting VM
-    [Tags]              bat   SP-T48  nuc  orin-nx  lenovo-x1
+    [Tags]              bat   pre-merge   SP-T48  nuc  orin-nx  lenovo-x1
     [Setup]             Run Keywords
     ...                 Connect to ghaf host  AND  Connect to netvm
     Switch Connection   ${netvm_ssh}
@@ -76,7 +76,7 @@ Verify wpa_supplicant.service is running
 
 Verify NetVM PCI device passthrough
     [Documentation]     Verify that proper PCI devices have been passed through to the NetVM
-    [Tags]              bat   SP-T96  nuc  orin-agx  orin-nx
+    [Tags]              bat   pre-merge   SP-T96  nuc  orin-agx  orin-nx
     [Setup]             Run Keywords
     ...                 Connect to ghaf host  AND  Connect to netvm
     Verify microvm PCI device passthrough    host_connection=${ghaf_host_ssh}    vm_connection=${netvm_ssh}    vmname=${NETVM_NAME}

diff --git a/Robot-Framework/test-suites/bat-tests/optee.robot b/Robot-Framework/test-suites/bat-tests/optee.robot
@@ -28,7 +28,7 @@ OP-TEE xtest
        ...              2. Delete corresponding "OP-TEE xtest XXXX" test case
        ...
        ...              (3. If everything is fixed (no more "-x"-flags), remove this comment!!)
-       [Tags]  bat  optee  optee-xtest  orin-agx  orin-nx  SP-T122
+       [Tags]  bat   pre-merge  optee  optee-xtest  orin-agx  orin-nx  SP-T122
 
        ${stdout}    ${stderr}    ${rc}=    Execute Command    xtest -x 1008 -x 1033    sudo=True    sudo_password=${PASSWORD}    return_stdout=True    return_stderr=True    return_rc=True
        Log     ${stdout}
@@ -39,7 +39,7 @@ OP-TEE xtest 1008
     [Documentation]   Xtest 1008
     ...               Test will be skipped in case of failure, because this is a known issue.
     ...               Please read OP-TEE Test suite comment
-    [Tags]  bat  optee  optee-xtest  orin-agx  orin-nx  SP-T129
+    [Tags]  bat   pre-merge  optee  optee-xtest  orin-agx  orin-nx  SP-T129
 
     ${stdout}    ${stderr}    ${rc}=    Execute Command    xtest 1008   sudo=True    sudo_password=${PASSWORD}    return_stdout=True    return_stderr=True    return_rc=True
     Should Be Equal As Integers    ${rc}    1
@@ -50,7 +50,7 @@ OP-TEE xtest 1033
     [Documentation]   Xtest 1033
     ...               Test will be skipped in case of failure, because this is a known issue.
     ...               Please read OP-TEE Test suite comment
-    [Tags]  bat  optee  optee-xtest  orin-agx  orin-nx  SP-T129
+    [Tags]  bat   pre-merge  optee  optee-xtest  orin-agx  orin-nx  SP-T129
 
     ${stdout}    ${stderr}    ${rc}=    Execute Command    xtest 1033   sudo=True    sudo_password=${PASSWORD}    return_stdout=True    return_stderr=True    return_rc=True
     Should Be Equal As Integers    ${rc}    1
@@ -63,7 +63,7 @@ Basic pkcs11-tool-optee test
     ...               calling OP-TEE. Then it generates RSA 2048-bit and ECDSA
     ...               secp256r1 keys, for which signing and signature
     ...               verification operations are tested.
-    [Tags]            bat  optee  SP-T113  orin-agx  orin-nx
+    [Tags]            bat   pre-merge  optee  SP-T113  orin-agx  orin-nx
 
     ${tool}=    Set Variable    "pkcs11-tool-optee"
     List key slots    ${tool}

diff --git a/Robot-Framework/test-suites/bat-tests/others.robot b/Robot-Framework/test-suites/bat-tests/others.robot
@@ -12,15 +12,15 @@ Library             ../../lib/output_parser.py
 Test ghaf version format
     [Documentation]    Test getting Ghaf version and verify its format:
     ...                Expected format: major.minor.yyyymmdd.commit_hash
-    [Tags]             bat   SP-T54  nuc  orin-agx  orin-nx  riscv  lenovo-x1
+    [Tags]             bat   pre-merge   SP-T54  nuc  orin-agx  orin-nx  riscv  lenovo-x1
     [Setup]     Connect
     Verify Ghaf Version Format
     [Teardown]  Close All Connections
 
 Test nixos version format
     [Documentation]    Test getting Nixos version and verify its format:
     ...                Expected format: major.minor.yyyymmdd.commit_hash (name)
-    [Tags]             bat   SP-T55  nuc  orin-agx  orin-nx  riscv  lenovo-x1
+    [Tags]             bat   pre-merge   SP-T55  nuc  orin-agx  orin-nx  riscv  lenovo-x1
     [Setup]     Connect
     Verify Nixos Version Format
     [Teardown]  Close All Connections
@@ -34,7 +34,7 @@ Check QSPI version
 
 Check systemctl status
     [Documentation]    Verify systemctl status is running
-    [Tags]             bat  SP-T98  nuc  orin-agx  orin-nx  riscv
+    [Tags]             bat   pre-merge  SP-T98  nuc  orin-agx  orin-nx  riscv
     [Setup]     Connect
     ${status}   ${output}   Run Keyword And Ignore Error    Verify Systemctl status
     IF  '${status}' == 'FAIL'
@@ -48,7 +48,7 @@ Check systemctl status
 
 Check all VMs are running
     [Documentation]    Verify systemctl status of all VMs is running
-    [Tags]             bat  SP-T68  lenovo-x1
+    [Tags]             bat   pre-merge  SP-T68  lenovo-x1
     [Setup]     Connect
     ${output}   Execute Command    microvm -l
     @{vms}      Extract VM names   ${output}