Fix nightly ui tier0 and Test UI tier1,2,3 jobs. (#1323)

* Test running on ubuntu 20 Signed-off-by: M Sajid Mansoori <[email protected]> * test workflow Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Test Signed-off-by: M Sajid Mansoori <[email protected]> * Change test nightly job to tier0 and fix regression tests Signed-off-by: M Sajid Mansoori <[email protected]> * minor fix Signed-off-by: M Sajid Mansoori <[email protected]> * minor fix Signed-off-by: M Sajid Mansoori <[email protected]> * minor fix Signed-off-by: M Sajid Mansoori <[email protected]> * minor fix Signed-off-by: M Sajid Mansoori <[email protected]> * minor fix Signed-off-by: M Sajid Mansoori <[email protected]> * Fix test ui tier1,tier2,tier3 and UI tier0 nightly jobs Signed-off-by: M Sajid Mansoori <[email protected]> --------- Signed-off-by: M Sajid Mansoori <[email protected]>
konveyor · Jan 31, 2025 · 28ea9d2 · 28ea9d2
1 parent d800cf7
commit 28ea9d2
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 227 deletions.
diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml
@@ -1,63 +1,30 @@
-name: Regression tests CI
+name: Test UI TIER1 , TIER2 , TIER3
 
-on:
+on: 
   push:
     branches:
       - main
-
 jobs:
   k8s-tier1:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        kubernetes_version: [v1.19.14]
     steps:
       - name: Checkout tackle
         uses: actions/checkout@v2
         with:
           repository: konveyor/tackle
           path: tackle
-      - name: Setup Minikube
-        uses: manusa/[email protected]
-        with:
-          minikube version: v1.22.0
-          kubernetes version: ${{ matrix.kubernetes_version }}
-          start args: "--addons=registry --addons=ingress"
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-
-      - name: Kubectl enable addons ingress
-        run: minikube addons enable ingress
-      - name: Kubectl enable addons registry
-        run: minikube addons enable registry
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Kubectl enable addons
-        run: minikube addons enable dashboard
-      - name: Kubectl enable olm
-        run: minikube addons enable olm
 
-      - name: Deploy CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/crds.yaml
-      - name: Deploy OLM
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/olm.yaml
-      - name: Deploy k8s
-        run: kubectl apply -f https://raw.githubusercontent.com/konveyor/tackle2-operator/main/tackle-k8s.yaml 
+      - name: Setup minikube
+        uses: konveyor/tackle2-operator/.github/actions/start-minikube@main
+        with:
+          memory: 'max'
+          cpus: 'max'
 
-      - name: Sleep 
-        run: sleep 150s
-        shell: bash
 
-      - name: Create CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/sshveta/tackle-ui-tests/test_prt/.github/install_tackle2_crd.yaml
+      - name: Install konveyor
+        uses: konveyor/tackle2-operator/.github/actions/install-konveyor@main
+        with:
+          tackle_cr: '{"kind":"Tackle","apiVersion":"tackle.konveyor.io/v1alpha1","metadata":{"name":"tackle"},"spec":{"image_pull_policy":"IfNotPresent","feature_auth_required":true}}'
 
       - name: Wait for pods to be ready. 
         run: sleep 150s
@@ -66,21 +33,6 @@ jobs:
       - name: Check pod status
         run: kubectl get pods -n konveyor-tackle
 
-      - name: Verify hub
-        run: kubectl wait deployment/tackle-hub --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify keycloack-controls
-        run: kubectl wait deployment/tackle-keycloak-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-keycloack-sso
-        run: kubectl wait deployment/tackle-keycloak-sso --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-operator
-        run: kubectl wait deployment/tackle-operator --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify pathfinder
-        run: kubectl wait deployment/tackle-pathfinder --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-pathfinder-postgresql
-        run: kubectl wait deployment/tackle-pathfinder-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-ui
-        run: kubectl wait deployment/tackle-ui --for condition=available --timeout=-1s -n konveyor-tackle
-
       - name: Wait for Ingress
         shell: bash
         run: |
@@ -106,59 +58,28 @@ jobs:
         run: npx cypress run --spec "cypress/e2e/tests/login.test.ts" --env user="admin",pass="password",tackleUrl=${{ env.CYPRESS_tackleUrl }}
       - name: Run Tier1 test cases
         run: |
-          npx cypress run --spec **/*.test.ts --env grepTags=@tier1,user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
+          CYPRESS_INCLUDE_TAGS=@tier1 npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
 
   k8s-tier2:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        kubernetes_version: [v1.20.10]
     steps:
       - name: Checkout tackle
         uses: actions/checkout@v2
         with:
           repository: konveyor/tackle
           path: tackle
-      - name: Setup Minikube
-        uses: manusa/[email protected]
-        with:
-          minikube version: v1.22.0
-          kubernetes version: ${{ matrix.kubernetes_version }}
-          start args: "--addons=registry --addons=ingress"
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-      - name: Kubectl enable addons ingress
-        run: minikube addons enable ingress
-      - name: Kubectl enable addons registry
-        run: minikube addons enable registry
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Kubectl enable addons
-        run: minikube addons enable dashboard
-      - name: Kubectl enable olm
-        run: minikube addons enable olm
 
-      - name: Deploy CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/crds.yaml
-      - name: Deploy OLM
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/olm.yaml
-      - name: Deploy k8s
-        run: kubectl apply -f https://raw.githubusercontent.com/konveyor/tackle2-operator/main/tackle-k8s.yaml 
+      - name: Setup minikube
+        uses: konveyor/tackle2-operator/.github/actions/start-minikube@main
+        with:
+          memory: 'max'
+          cpus: 'max'
 
-      - name: Sleep 
-        run: sleep 150s
-        shell: bash
 
-      - name: Create CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/sshveta/tackle-ui-tests/test_prt/.github/install_tackle2_crd.yaml
+      - name: Install konveyor
+        uses: konveyor/tackle2-operator/.github/actions/install-konveyor@main
+        with:
+          tackle_cr: '{"kind":"Tackle","apiVersion":"tackle.konveyor.io/v1alpha1","metadata":{"name":"tackle"},"spec":{"image_pull_policy":"IfNotPresent","feature_auth_required":true}}'
 
       - name: Wait for pods to be ready. 
         run: sleep 150s
@@ -167,21 +88,6 @@ jobs:
       - name: Check pod status
         run: kubectl get pods -n konveyor-tackle
 
-      - name: Verify hub
-        run: kubectl wait deployment/tackle-hub --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify keycloack-controls
-        run: kubectl wait deployment/tackle-keycloak-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-keycloack-sso
-        run: kubectl wait deployment/tackle-keycloak-sso --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-operator
-        run: kubectl wait deployment/tackle-operator --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify pathfinder
-        run: kubectl wait deployment/tackle-pathfinder --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-pathfinder-postgresql
-        run: kubectl wait deployment/tackle-pathfinder-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-ui
-        run: kubectl wait deployment/tackle-ui --for condition=available --timeout=-1s -n konveyor-tackle
-
       - name: Wait for Ingress
         shell: bash
         run: |
@@ -207,60 +113,28 @@ jobs:
         run: npx cypress run --spec "cypress/e2e/tests/login.test.ts" --env user="admin",pass="password",tackleUrl=${{ env.CYPRESS_tackleUrl }}
       - name: Run Tier2 test cases
         run: |
-          npx cypress run --spec **/*.test.ts --env grepTags=@tier2,user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
+         CYPRESS_INCLUDE_TAGS=@tier2 npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
   
   k8s-tier3:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        kubernetes_version: [v1.21.4]
     steps:
       - name: Checkout tackle
         uses: actions/checkout@v2
         with:
           repository: konveyor/tackle
           path: tackle
-      - name: Setup Minikube
-        uses: manusa/[email protected]
+
+      - name: Setup minikube
+        uses: konveyor/tackle2-operator/.github/actions/start-minikube@main
         with:
-          minikube version: v1.22.0
-          kubernetes version: ${{ matrix.kubernetes_version }}
-          start args: "--addons=registry --addons=ingress"
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-
-      - name: Kubectl enable addons ingress
-        run: minikube addons enable ingress
-      - name: Kubectl enable addons registry
-        run: minikube addons enable registry
-      - name: Validate Minikube
-        run: minikube status | grep Running
-      - name: Validate enabled addon in arg
-        run: minikube addons list -o json | jq '.registry.Status' | grep enabled
-      - name: Validate Cluster
-        run: kubectl get nodes
-      - name: Kubectl enable addons
-        run: minikube addons enable dashboard
-      - name: Kubectl enable olm
-        run: minikube addons enable olm
+          memory: 'max'
+          cpus: 'max'
 
-      - name: Deploy CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/crds.yaml
-      - name: Deploy OLM
-        run: kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/olm.yaml
-      - name: Deploy k8s
-        run: kubectl apply -f https://raw.githubusercontent.com/konveyor/tackle2-operator/main/tackle-k8s.yaml 
 
-      - name: Sleep 
-        run: sleep 150s
-        shell: bash
-
-      - name: Create CRD
-        run: kubectl apply -f https://raw.githubusercontent.com/sshveta/tackle-ui-tests/test_prt/.github/install_tackle2_crd.yaml
+      - name: Install konveyor
+        uses: konveyor/tackle2-operator/.github/actions/install-konveyor@main
+        with:
+          tackle_cr: '{"kind":"Tackle","apiVersion":"tackle.konveyor.io/v1alpha1","metadata":{"name":"tackle"},"spec":{"image_pull_policy":"IfNotPresent","feature_auth_required":true}}'
 
       - name: Wait for pods to be ready. 
         run: sleep 150s
@@ -269,21 +143,6 @@ jobs:
       - name: Check pod status
         run: kubectl get pods -n konveyor-tackle
 
-      - name: Verify hub
-        run: kubectl wait deployment/tackle-hub --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify keycloack-controls
-        run: kubectl wait deployment/tackle-keycloak-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-keycloack-sso
-        run: kubectl wait deployment/tackle-keycloak-sso --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-operator
-        run: kubectl wait deployment/tackle-operator --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify pathfinder
-        run: kubectl wait deployment/tackle-pathfinder --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-pathfinder-postgresql
-        run: kubectl wait deployment/tackle-pathfinder-postgresql --for condition=available --timeout=-1s -n konveyor-tackle
-      - name: Verify tackle-ui
-        run: kubectl wait deployment/tackle-ui --for condition=available --timeout=-1s -n konveyor-tackle
-
       - name: Wait for Ingress
         shell: bash
         run: |
@@ -300,7 +159,7 @@ jobs:
           echo $external_ip;
           export endpoint=$(minikube ip);
           echo "CYPRESS_tackleUrl=https://$endpoint" >>$GITHUB_ENV'
-
+     
       - name: Checkout to branch
         uses: actions/checkout@v2
       - name: Install NPM
@@ -309,4 +168,4 @@ jobs:
         run: npx cypress run --spec "cypress/e2e/tests/login.test.ts" --env user="admin",pass="password",tackleUrl=${{ env.CYPRESS_tackleUrl }}
       - name: Run Tier3 test cases
         run: |
-          npx cypress run --spec **/*.test.ts --env grepTags=@tier3,user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
+         CYPRESS_INCLUDE_TAGS=@tier3 npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}