fix

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
eclipse-che · Feb 12, 2021 · ae8639f · ae8639f
1 parent ecf63a9
commit ae8639f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.ci/cico_updates_openshift.sh b/.ci/cico_updates_openshift.sh
@@ -20,10 +20,6 @@ source "${OPERATOR_REPO}"/.github/bin/oauth-provision.sh
 #Stop execution on any error
 trap "catchFinish" EXIT SIGINT
 
-overrideDefaults() {
-  export OAUTH="true"
-}
-
 runTests() {
   "${OPERATOR_REPO}"/olm/testUpdate.sh "openshift" "stable" ${NAMESPACE}
   waitEclipseCheDeployed ${LAST_PACKAGE_VERSION}
@@ -33,7 +29,6 @@ runTests() {
 }
 
 init
-overrideDefaults
 provisionOpenShiftOAuthUser
 initStableTemplates "openshift" "stable"
 runTests
diff --git a/.github/bin/oauth-provision.sh b/.github/bin/oauth-provision.sh
@@ -38,7 +38,7 @@ function provisionOAuth() {
   # Obtain from Keycloak the token to make api request authentication
   IDP_TOKEN=$(curl -k --location --request POST ''$IDP_HOST'/auth/realms/master/protocol/openid-connect/token' \
   --header 'Content-Type: application/x-www-form-urlencoded' \
-  --data-urlencode 'username=admin' \
+  --data-urlencode 'username='$IDP_USER'' \
   --data-urlencode 'password='$IDP_PASSWORD'' \
   --data-urlencode 'grant_type=password' \
   --data-urlencode 'client_id=admin-cli' | jq -r .access_token)
@@ -58,7 +58,7 @@ function provisionOAuth() {
   --data '{
       "identityProvider": "openshift-v4",
       "userId": "'$OCP_USER_UID'",
-      "userName": "admin"
+      "userName": "'$IDP_USER'"
   }'
 
 # Create OAuthClientAuthorization object for Eclipse Che in Cluster. 
@@ -83,8 +83,8 @@ UPDATE federated_identity SET token ='{"access_token":"INSERT_TOKEN_HERE","expir
 WHERE federated_username = 'admin'
 EOF
 
-  TOKEN=$(oc whoami -t)
-  sed -i "s|INSERT_TOKEN_HERE|$TOKEN|g" path.sql
+  OCP_TOKEN=$(oc whoami -t)
+  sed -i "s|INSERT_TOKEN_HERE|$OCP_TOKEN|g" path.sql
 
   # Insert sql script inside of postgres and execute it.
   POSTGRES_POD=$(oc get pods -o json -n eclipse-che | jq -r '.items[] | select(.metadata.name | test("postgres-")).metadata.name')