From 33c5571a8101101b590e10b0c3385661f3935873 Mon Sep 17 00:00:00 2001
From: Valeriy Svydenko <vsvydenk@redhat.com>
Date: Wed, 27 Sep 2023 13:14:14 +0300
Subject: [PATCH] read registry url before changing user

Signed-off-by: Valeriy Svydenko <vsvydenk@redhat.com>
---
 .ci/openshift-ci/common-functions.sh    | 9 ++++++---
 .ci/openshift-ci/devworkspace-test.yaml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.ci/openshift-ci/common-functions.sh b/.ci/openshift-ci/common-functions.sh
index 9dce5b56ce..b5d3fc208f 100755
--- a/.ci/openshift-ci/common-functions.sh
+++ b/.ci/openshift-ci/common-functions.sh
@@ -83,6 +83,11 @@ forwardPortToService() {
   sleep 3s
 }
 
+getPluginRegistryURL() {
+  PLUGIN_REGISTRY_URL=$(oc get checlusters.org.eclipse.che -n "${CHE_NAMESPACE}" "${CHE_NAMESPACE}" -o=jsonpath='{.status.pluginRegistryURL}')
+  echo "[INFO] Plugin registry URL: ${PLUGIN_REGISTRY_URL}"
+}
+
 killProcessByPort() {
   fuser -k ${CHE_FORWARDED_PORT}/tcp
 }
@@ -130,9 +135,6 @@ runTestWorkspaceWithGitRepoUrlAndCustomEditor() {
   OCP_USER_NAMESPACE=$4
   EDITOR_ID=$5
 
-  PLUGIN_REGISTRY_URL=$(oc get checlusters.org.eclipse.che -n "${CHE_NAMESPACE}" "${CHE_NAMESPACE}" -o=jsonpath='{.status.pluginRegistryURL}')
-  echo "[INFO] Plugin registry URL: ${PLUGIN_REGISTRY_URL}"
-
   EDITOR_URL=$PLUGIN_REGISTRY_URL/plugins/$EDITOR_ID/devfile.yaml
 
   oc project "${OCP_USER_NAMESPACE}"
@@ -201,5 +203,6 @@ setupTestEnvironment() {
   createCustomResourcesFile
   deployChe
   forwardPortToService
+  getPluginRegistryURL
   initUserNamespace "${OCP_USER_NAME}"
 }
diff --git a/.ci/openshift-ci/devworkspace-test.yaml b/.ci/openshift-ci/devworkspace-test.yaml
index 9a52720f2c..fed6f83497 100644
--- a/.ci/openshift-ci/devworkspace-test.yaml
+++ b/.ci/openshift-ci/devworkspace-test.yaml
@@ -12,7 +12,7 @@ spec:
             origin: git-repo-url
   contributions:
     - name: che-code
-      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
+      uri: edior-uri
       components:
         - name: che-code-runtime-description
           container: