Merge branch 'master' of https://github.com/Telecominfraproject/wlan-testing

.github/workflows/advanced.yml

@@ -25,7 +25,7 @@ jobs:
         registry_password: ${{ secrets.DOCKER_USER_PASSWORD }}
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: [ self-hosted, small ]
     needs: [ build ]
     env:
       AWS_EKS_NAME: tip-wlan-main
@@ -43,6 +43,16 @@ jobs:
         - advanced-02
 
     steps:
+    - name: install aws CLI tool
+      run: |
+        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+        unzip awscliv2.zip
+        sudo ./aws/install
+    - name: install kubectl
+      run: |
+        curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+        sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+
     - name: get EKS access credentials
       run: aws eks update-kubeconfig  --name ${{ env.AWS_EKS_NAME }}
 
@@ -156,6 +166,7 @@ jobs:
       run: |
         kubectl delete ns "${{ steps.namespace.outputs.name }}" --wait=true
 
+
   report:
     needs: [ test ]
     if: always()

tests/e2e/basic/conftest.py

@@ -71,6 +71,7 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtur
                 if vlan_list[i] > 4095 or vlan_list[i] < 1:
                     vlan_list.pop(i)
     if request.param["mode"] == "VLAN":
+        lf_tools.reset_scenario()
         lf_tools.add_vlan(vlan_ids=vlan_list)
 
     # call this, if 1.x