From e0e0a0e5e25a5c96490d5f499f722ef8b6dc2445 Mon Sep 17 00:00:00 2001
From: Pawel Szkamruk <pszkamruk@splunk.com>
Date: Tue, 7 Nov 2023 13:48:06 +0100
Subject: [PATCH] pipeline v24

---
 .github/workflows/ci-ui-tests.yaml | 52 +++++++-----------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/ci-ui-tests.yaml b/.github/workflows/ci-ui-tests.yaml
index a4847c7cf..53c743c49 100644
--- a/.github/workflows/ci-ui-tests.yaml
+++ b/.github/workflows/ci-ui-tests.yaml
@@ -7,52 +7,17 @@ on:
       - "next"
       - "sc4snmp-ui-tests"
 jobs:
-  run-ui-e2e-tests-basic:
-    name: Run UI e2e tests
+  run-ui-e2e-tests:
+    name: run UI e2e tests
     runs-on: ubuntu-latest
     timeout-minutes: 120
     env:
       CI_EXECUTION_TYPE: ci
-    steps:
-      - name: Checkout Project
-        uses: actions/checkout@v3
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-
-      - name: prepare values.yaml for configuration storing
-        working-directory: integration_tests
-        run: |
-          sed -i "s|/home/splunker|$(pwd)|g" values.yaml
 
-      - name: install microk8s
-        run: |
-          sudo snap install microk8s --classic --channel=1.25/stable
-          sudo apt-get install snmp -y
-          sudo apt-get install python3-dev -y
+    strategy:
+      matrix:
+        execution-type: ["basic", "extended"]
 
-      - name: run automatic_setup.sh
-        run: integration_tests/automatic_setup.sh
-
-      - name: install dependencies
-        working-directory: ui_tests
-        run: |
-          pip install -r requirements.txt
-          export PATH="/home/ubuntu/.local/bin:$PATH"
-
-      - name: run tests
-        working-directory: ui_tests
-        run: |
-          pytest -vvv --splunk-user=admin --splunk-password="changeme2" --splunk-host="localhost" --device-simulator="$(hostname -I | cut -d " " -f1)" -k basic
-
-  run-ui-e2e-tests-integration:
-    name: Run UI e2e tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    env:
-      CI_EXECUTION_TYPE: ci
     steps:
       - name: Checkout Project
         uses: actions/checkout@v3
@@ -76,6 +41,11 @@ jobs:
       - name: run automatic_setup.sh
         run: integration_tests/automatic_setup.sh
 
+#      - name: run tests
+#        working-directory: integration_tests
+#        run: |
+#          poetry run pytest --splunk_host="localhost" --splunk_password="changeme2" --trap_external_ip="$(hostname -I | cut -d " " -f1)"
+#
       - name: install dependencies
         working-directory: ui_tests
         run: |
@@ -85,4 +55,4 @@ jobs:
       - name: run tests
         working-directory: ui_tests
         run: |
-          pytest -vvv --splunk-user=admin --splunk-password="changeme2" --splunk-host="localhost" --device-simulator="$(hostname -I | cut -d " " -f1)" -k extended
\ No newline at end of file
+          pytest -vvv --splunk-user=admin --splunk-password="changeme2" --splunk-host="localhost" --device-simulator="$(hostname -I | cut -d " " -f1)" -k ${{ matrix.execution-type }}
\ No newline at end of file