From 162cda431a1c93d4d64d039ce2169e9657e04256 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Fri, 19 Feb 2021 16:52:52 +0200
Subject: [PATCH] User --version flag to deploy and update Eclipse Che (#683)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../minishift/test-stable-operator-update.sh  | 19 +++++++++++++------
 .../minishift-stable-operator-update.yaml     |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/bin/minishift/test-stable-operator-update.sh b/.github/bin/minishift/test-stable-operator-update.sh
index 2e96dc7e4..a22ddefd2 100755
--- a/.github/bin/minishift/test-stable-operator-update.sh
+++ b/.github/bin/minishift/test-stable-operator-update.sh
@@ -20,16 +20,23 @@ source "${OPERATOR_REPO}"/.github/bin/common.sh
 # Stop execution on any error
 trap "catchFinish" EXIT SIGINT
 
-prepareTemplates() {
-  disableOpenShiftOAuth ${PREVIOUS_OPERATOR_TEMPLATE}
-  disableOpenShiftOAuth ${LAST_OPERATOR_TEMPLATE}
+preparePatchYaml() {
+  cat >${OPERATOR_REPO}/tmp/patch.yaml<<EOF
+spec:
+  auth:
+    updateAdminPassword: false
+    openShiftoAuth: false
+EOF
 }
 
 runTest() {
-  deployEclipseChe "operator" "minishift" "quay.io/eclipse/che-operator:${PREVIOUS_PACKAGE_VERSION}" ${PREVIOUS_OPERATOR_TEMPLATE}
+  chectl server:deploy --platform minishift --installer operator \
+    --version ${PREVIOUS_PACKAGE_VERSION} \
+    --che-operator-cr-patch-yaml ${OPERATOR_REPO}/tmp/patch.yaml
+
   createWorkspace
 
-  updateEclipseChe "quay.io/eclipse/che-operator:${LAST_PACKAGE_VERSION}" ${LAST_OPERATOR_TEMPLATE}
+  chectl server:update --version ${LAST_PACKAGE_VERSION} -y
   waitEclipseCheDeployed ${LAST_PACKAGE_VERSION}
 
   startExistedWorkspace
@@ -39,5 +46,5 @@ runTest() {
 initDefaults
 installYq
 initStableTemplates "openshift" "stable"
-prepareTemplates
+preparePatchYaml
 runTest
diff --git a/.github/workflows/minishift-stable-operator-update.yaml b/.github/workflows/minishift-stable-operator-update.yaml
index 98f1d9f3a..cda4085f8 100644
--- a/.github/workflows/minishift-stable-operator-update.yaml
+++ b/.github/workflows/minishift-stable-operator-update.yaml
@@ -27,7 +27,7 @@ jobs:
         export MINISHIFT_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }}
         minishift start --memory=5500 --vm-driver=virtualbox
     - name: Install chectl
-      run: bash <(curl -sL  https://www.eclipse.org/che/chectl/) --channel=stable
+      run: bash <(curl -sL  https://www.eclipse.org/che/chectl/) --channel=next
     - name: Install jq
       run: sudo pip install yq
     - name: Replace Minishift default certificates