@@ -83,12 +83,20 @@ jobs:
8383
8484      - name : Set preupgrade konveyor value 
8585        run : |  
86-           konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 1  | tr -d '[:space:]') 
86+           konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 2  | tr -d '[:space:]') 
8787          echo "mtaVersion=$konveyor_version" >> $GITHUB_ENV 
88+           echo "Konveyor version: $konveyor_version" 
89+ 
90+        - name : Display konveyor version for confirmation 
91+         run : | 
92+           echo "Confirming konveyor version from environment variable: $mtaVersion" 
93+           echo "Environment variable mtaVersion value: ${{ env.mtaVersion }}" 
8894
8995       - name : Use mtaVersion 
9096        run : echo "Konveyor version is $mtaVersion" 
9197
98+       
99+ 
92100      - name : Check pod status 
93101        run : kubectl get pods -n konveyor-tackle 
94102
@@ -118,12 +126,23 @@ jobs:
118126      - name : Install NPM 
119127        run : npm install . 
120128
129+       - name : Set Keycloak admin password and git credentials 
130+         run : | 
131+           keycloak_password=$(kubectl get secret tackle-keycloak-sso -n konveyor-tackle -o=jsonpath='{.data.admin-password}' | base64 -d) 
132+           echo "cypress_keycloakAdminPassword=$keycloak_password" >> $GITHUB_ENV 
133+            
121134       - name : Run cypress login test 
122135        run : npx cypress run --spec "cypress/e2e/tests/login.test.ts" --env user="admin",pass="password",tackleUrl=${{ env.CYPRESS_tackleUrl }} 
123136
124137      - name : Run Preupgrade test cases 
125138        run : | 
126-           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 }} 
139+           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 }} 
140+ 
141+        - uses : actions/upload-artifact@v4 
142+         if : failure() 
143+         with :
144+           name : minikube-tests-screenshots 
145+           path : /home/runner/work/tackle-ui-tests/tackle-ui-tests/cypress/screenshots/ 
127146
128147      - name : Checkout to initial branch 
129148        run : git checkout $INIT_BRANCH 
@@ -139,9 +158,14 @@ jobs:
139158
140159      - name : Set postupgrade konveyor value 
141160        run : |  
142-           konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 1  | tr -d '[:space:]') 
161+           konveyor_version=$(kubectl get csv -n konveyor-tackle -o=custom-columns=:spec.version | head -n 2  | tr -d '[:space:]') 
143162          echo "mtaVersion=$konveyor_version" >> $GITHUB_ENV 
144163
164+        - name : Set Keycloak admin password and git credentials (post-upgrade) 
165+         run : | 
166+           keycloak_password=$(kubectl get secret tackle-keycloak-sso -n konveyor-tackle -o=jsonpath='{.data.admin-password}' | base64 -d) 
167+           echo "cypress_keycloakAdminPassword=$keycloak_password" >> $GITHUB_ENV 
168+ 
145169       - name : Use mtaVersion 
146170        run : echo "Konveyor version is $mtaVersion" 
147171
@@ -151,7 +175,7 @@ jobs:
151175
152176      - name : Run Post upgrade test cases 
153177        run : | 
154-           CYPRESS_INCLUDE_TAGS=@post-upgrade npx cypress run --spec **/*.test.ts --env user=admin,pass=Dog8code,tackleUrl=${{ env.CYPRESS_tackleUrl }} 
178+           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 }}  
155179
156180       - uses : actions/upload-artifact@v4 
157181        if : failure() 
0 commit comments