diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4dca3f4fa..45091a00e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,10 +64,10 @@ jobs: fi - name: Run make-release.sh script (commit changes, create branch, create PR) run: | - # since we're using Flavius' token below to generate PRs, should also make tags/branches/commits by same owner + # since we're using Bazko' token below to generate PRs, should also make tags/branches/commits by same owner # see https://github.com/che-incubator/chectl/settings/secrets/actions for the token used - git config --global user.name "Flavius Lacatusu" - git config --global user.email "flacatus@redhat.com" + git config --global user.name "Anatolii Bazko" + git config --global user.email "abazko@redhat.com" export GITHUB_TOKEN=${{ secrets.CHE_INCUBATOR_BOT_GITHUB_TOKEN }} DWO_VERSION=${{ github.event.inputs.devworkspaceOperatorVersion }} if [[ -z ${DWO_VERSION} ]]; then diff --git a/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts b/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts index 0e22dcc04..a244e6f3b 100644 --- a/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts +++ b/src/tasks/installers/eclipse-che/eclipse-che-tasks.ts @@ -305,7 +305,7 @@ export namespace EclipseCheTasks { ctx[OperatorImageUpgradeContext.NEW_IMAGE_NAME] = newImage ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG] = newTag - task.title = `${task.title} ${ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG]} -> ${ctx[OperatorImageUpgradeContext.DEPLOYED_IMAGE_TAG]}` + task.title = `${task.title} ${ctx[OperatorImageUpgradeContext.DEPLOYED_IMAGE_TAG]} -> ${ctx[OperatorImageUpgradeContext.NEW_IMAGE_TAG]}` }, } } diff --git a/test/e2e/e2e-upgrade-version.test.ts b/test/e2e/e2e-upgrade-version.test.ts index e407eaa02..ce903399c 100644 --- a/test/e2e/e2e-upgrade-version.test.ts +++ b/test/e2e/e2e-upgrade-version.test.ts @@ -39,8 +39,8 @@ describe('Test Che upgrade', () => { const binChectl = E2eHelper.getChectlBinaries() // scale deployments down to free up some resources await helper.runCliCommand('kubectl', ['scale', 'deployment', 'che', '--replicas=0', `-n ${NAMESPACE}`]) - await helper.runCliCommand(binChectl, ['server:update', '-y', `-n ${NAMESPACE}`, '--telemetry=off']) + await helper.runCliCommand(binChectl, ['server:start', `-n ${NAMESPACE}`, '--telemetry=off']) await helper.waitForCheServerImageTag(helper.getNewVersion(), UPDATE_CHE_TIMEOUT_MS) })