Test

Signed-off-by: M Sajid Mansoori <[email protected]>

Author: msajidmansoori12

.github/workflows/upgrade-ci.yml

@@ -83,12 +83,20 @@ jobs:
 
       - name: Set preupgrade konveyor value
         run: | 
-          konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 1 | tr -d '[:space:]')
+          konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 2 | tr -d '[:space:]')
           echo "mtaVersion=$konveyor_version" >> $GITHUB_ENV
+          echo "Konveyor version: $konveyor_version"
+
+      - name: Display konveyor version for confirmation
+        run: |
+          echo "Confirming konveyor version from environment variable: $mtaVersion"
+          echo "Environment variable mtaVersion value: ${{ env.mtaVersion }}"
 
       - name: Use mtaVersion
         run: echo "Konveyor version is $mtaVersion"
 
+      
+
       - name: Check pod status
         run: kubectl get pods -n konveyor-tackle
 
@@ -118,12 +126,23 @@ jobs:
       - name: Install NPM
         run: npm install .
 
+      - name: Set Keycloak admin password and git credentials
+        run: |
+          keycloak_password=$(kubectl get secret tackle-keycloak-sso -n konveyor-tackle -o=jsonpath='{.data.admin-password}' | base64 -d)
+          echo "cypress_keycloakAdminPassword=$keycloak_password" >> $GITHUB_ENV
+          
       - name: Run cypress login test
         run: npx cypress run --spec "cypress/e2e/tests/login.test.ts" --env user="admin",pass="password",tackleUrl=${{ env.CYPRESS_tackleUrl }}
 
       - name: Run Preupgrade test cases
         run: |
-          CYPRESS_INCLUDE_TAGS=@pre-upgrade npx cypress run --spec cypress/e2e/tests/upgrade/create_upgrade_data.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
+          CYPRESS_INCLUDE_TAGS=@pre-upgrade npx cypress run --spec cypress/e2e/tests/upgrade/create_upgrade_data.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }},git_user=${{ secrets.KONVEYOR_GIT_USER }},git_password=${{ secrets.KONVEYOR_GIT_PASSWORD }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: minikube-tests-screenshots
+          path: /home/runner/work/tackle-ui-tests/tackle-ui-tests/cypress/screenshots/
 
       - name: Checkout to initial branch
         run: git checkout $INIT_BRANCH
@@ -139,9 +158,14 @@ jobs:
 
       - name: Set postupgrade konveyor value
         run: | 
-          konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 1 | tr -d '[:space:]')
+          konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 2 | tr -d '[:space:]')
           echo "mtaVersion=$konveyor_version" >> $GITHUB_ENV
 
+      - name: Set Keycloak admin password and git credentials (post-upgrade)
+        run: |
+          keycloak_password=$(kubectl get secret tackle-keycloak-sso -n konveyor-tackle -o=jsonpath='{.data.admin-password}' | base64 -d)
+          echo "cypress_keycloakAdminPassword=$keycloak_password" >> $GITHUB_ENV
+
       - name: Use mtaVersion
         run: echo "Konveyor version is $mtaVersion"
 
@@ -151,7 +175,7 @@ jobs:
 
       - name: Run Post upgrade test cases
         run: |
-          CYPRESS_INCLUDE_TAGS=@post-upgrade npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }}
+          CYPRESS_INCLUDE_TAGS=@post-upgrade npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }},git_user=${{ env.cypress_git_user }},git_password=${{ env.cypress_git_password }}
 
       - uses: actions/upload-artifact@v4
         if: failure()

hack/install-postupgrade-konveyor.sh

@@ -14,7 +14,7 @@ kubectl patch sub konveyor-operator -n konveyor-tackle --type=merge -p "{\"spec\
 
 echo "Patching installplan for konveyor..."
 
-kubectl patch ip $(kubectl get ip -n "${NAMESPACE}" | egrep "$POSTUPGRADE_VERSION"|awk '{print $1}') -n "${NAMESPACE}" --type merge --patch '{"spec":{"approved":true}}'
+kubectl patch installplan $(kubectl get installplan -n "${NAMESPACE}" | egrep "$POSTUPGRADE_VERSION"|awk '{print $1}') -n "${NAMESPACE}" --type merge --patch '{"spec":{"approved":true}}'
 
 kubectl wait --namespace "${NAMESPACE}" --for=condition=Successful --timeout=600s tackles.tackle.konveyor.io/tackle