From 062fec0263bee63e2f3ea951a2ee615935c95a11 Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Tue, 2 Nov 2021 16:29:27 +0200
Subject: [PATCH] chore: Have proper versioning of Che e2e project

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
 make-release.sh        | 12 +++++++++---
 tests/e2e/package.json |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/make-release.sh b/make-release.sh
index 4cbfb74a504..0f5662d867b 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -73,8 +73,11 @@ bump_version () {
 
   echo "Updating project version to ${NEXT_VERSION}"
   echo "${NEXT_VERSION}" > VERSION
-  git add VERSION
-  COMMIT_MSG="[release] Bump to ${NEXT_VERSION} in ${BUMP_BRANCH}"
+
+  npm --no-git-tag-version version --allow-same-version "${NEXT_VERSION}"
+  sed_in_place -r -e "/@eclipse-che\/api|@eclipse-che\/workspace-client|@eclipse-che\/workspace-telemetry-client/!s/(\"@eclipse-che\/..*\": )(\".*\")/\1\"$VERSION\"/" package.json
+  git add VERSION package.json
+  COMMIT_MSG="chore: Bump to ${NEXT_VERSION} in ${BUMP_BRANCH}"
   git commit -asm "${COMMIT_MSG}"
   git pull origin "${BUMP_BRANCH}"
 
@@ -149,6 +152,9 @@ set -e
 echo "${VERSION}" > VERSION
 git add VERSION
 
+sed_in_place -r -e "/@eclipse-che\/api|@eclipse-che\/workspace-client|@eclipse-che\/workspace-telemetry-client/!s/(\"@eclipse-che\/..*\": )(\".*\")/\1\"$VERSION\"/" package.json
+npm --no-git-tag-version version --allow-same-version "${VERSION}"
+
 echo "Copying source code to dockerfile directory"
 cp -r "tests/e2e" "dockerfiles/e2e/e2e"
 
@@ -163,7 +169,7 @@ update_issue_template "${VERSION}" "${ISSUE_TEMPLATE_FILE}"
 # tag the release
 git tag "${VERSION}"
 git push origin "${VERSION}"
-COMMIT_MSG="[release] Release ${VERSION}"
+COMMIT_MSG="chore: Release ${VERSION}"
 git commit -asm "${COMMIT_MSG}"
 
 # now update ${BASEBRANCH} to the new snapshot version
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
index 9f1fa342968..0ba261d0476 100644
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "e2e",
-  "version": "1.0.0",
+  "name": "@eclipse-che/che-e2e",
+  "version": "7.39.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -49,7 +49,7 @@
     "typescript": "3.9.9"
   },
   "dependencies": {
-    "@eclipse-che/api": "7.5.0-SNAPSHOT",
+    "@eclipse-che/api": "7.38.1",
     "inversify": "5.0.1",
     "reflect-metadata": "0.1.13"
   },