test: using the same set of longhorn resources throughout the 2 stage…

… upgrade test Signed-off-by: Yang Chiu <yang.chiu@suse.com>
longhorn · Aug 30, 2024 · 7087f95 · 7087f95
1 parent 5e42ab0
commit 7087f95
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 146 deletions.
diff --git a/manager/integration/tests/conftest.py b/manager/integration/tests/conftest.py
@@ -24,6 +24,7 @@
 LONGHORN_REPO = "--longhorn-repo"
 FLUX_HELM_CHART_URL = "--flux-helm-chart-url"
 FLUX_HELM_CHART_VERSION = "--flux-helm-chart-version"
+UPGRADE_LH_TRANSIENT_VERSION = "--upgrade-lh-transient-version"
 UPGRADE_LH_REPO_URL = "--upgrade-lh-repo-url"
 UPGRADE_LH_REPO_BRANCH = "--upgrade-lh-repo-branch"
 UPGRADE_LH_MANAGER_IMAGE = "--upgrade-lh-manager-image"
@@ -103,6 +104,14 @@ def pytest_addoption(parser):
                      help='''if longhorn install method is flux, specify the
                      chart version when create flux helm release resource''')
 
+    parser.addoption(UPGRADE_LH_TRANSIENT_VERSION, action="store",
+                     default="",
+                     help='''set longhorn transient version, if provided,
+                     longhorn will first install the stable version,
+                     and then upgrade to this transient version,
+                     and finally upgrade to the version to be tested.
+                     (default:"")''')
+
     longhorn_repo_url =\
         "https://github.com/longhorn/longhorn.git"
     parser.addoption(UPGRADE_LH_REPO_URL, action="store",

diff --git a/manager/integration/tests/test_upgrade.py b/manager/integration/tests/test_upgrade.py
@@ -1,4 +1,3 @@
-import os
 import pytest
 import subprocess
 import time
@@ -100,6 +99,11 @@ def flux_helm_chart_version(request):
     return request.config.getoption("--flux-helm-chart-version")
 
 
+@pytest.fixture
+def upgrade_longhorn_transient_version(request):
+    return request.config.getoption("--upgrade-lh-transient-version")
+
+
 @pytest.fixture
 def upgrade_longhorn_repo_url(request):
     return request.config.getoption("--upgrade-lh-repo-url")
@@ -135,17 +139,6 @@ def upgrade_longhorn_backing_image_manager_image(request):
     return request.config.getoption("--upgrade-lh-backing-image-manager-image")
 
 
-def get_longhorn_upgrade_type():
-    return [os.environ.get('LONGHORN_UPGRADE_TYPE', '')]
-
-
-@pytest.fixture(params=get_longhorn_upgrade_type())
-def longhorn_upgrade_type():
-    # add parameter "from_stable" or "from_transient" to test_upgrade test case
-    # to distinguish them in the junit report.
-    pass
-
-
 def longhorn_upgrade(longhorn_install_method,
                      rancher_hostname,
                      rancher_access_key,
@@ -223,15 +216,15 @@ def longhorn_upgrade(longhorn_install_method,
 
 
 @pytest.mark.upgrade  # NOQA
-def test_upgrade(longhorn_upgrade_type,
-                 longhorn_install_method,
+def test_upgrade(longhorn_install_method,
                  rancher_hostname,
                  rancher_access_key,
                  rancher_secret_key,
                  rancher_chart_install_version,
                  longhorn_repo,
                  flux_helm_chart_url,
                  flux_helm_chart_version,
+                 upgrade_longhorn_transient_version,
                  upgrade_longhorn_repo_url,
                  upgrade_longhorn_repo_branch,
                  upgrade_longhorn_manager_image,
@@ -277,6 +270,7 @@ def test_upgrade(longhorn_upgrade_type,
     18. Verify the vol_rebuild is still healthy
     """
     longhorn_install_method = longhorn_install_method
+    longhorn_transient_version = upgrade_longhorn_transient_version
     longhorn_repo_url = upgrade_longhorn_repo_url
     longhorn_repo_branch = upgrade_longhorn_repo_branch
     longhorn_manager_image = upgrade_longhorn_manager_image
@@ -402,6 +396,27 @@ def test_upgrade(longhorn_upgrade_type,
     write_pod_volume_data(core_api, rwx_statefulset_pod_name,
                           rwx_test_data, filename='test1')
 
+    if longhorn_transient_version and len(longhorn_transient_version) > 0:
+        # upgrade Longhorn manager to transient version
+        assert longhorn_upgrade(longhorn_install_method,
+                                rancher_hostname,
+                                rancher_access_key,
+                                rancher_secret_key,
+                                longhorn_transient_version,
+                                longhorn_repo,
+                                flux_helm_chart_url,
+                                longhorn_transient_version,
+                                longhorn_repo_url,
+                                longhorn_transient_version,
+                                "",
+                                "",
+                                "",
+                                "",
+                                "")
+
+        # wait for 1 minute before checking pod restarts
+        time.sleep(60)
+
     # upgrade Longhorn manager
     assert longhorn_upgrade(longhorn_install_method,
                             rancher_hostname,

diff --git a/pipelines/argocd/Jenkinsfile b/pipelines/argocd/Jenkinsfile
@@ -128,14 +128,9 @@ node {
             stage ('report generation') {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-junit-report.xml ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.LONGHORN_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
-                else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                if(params.LONGHORN_UPGRADE_TEST) {
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/argocd/scripts/longhorn-setup.sh b/pipelines/argocd/scripts/longhorn-setup.sh
@@ -39,16 +39,8 @@ main(){
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     create_argocd_app "${LONGHORN_STABLE_VERSION}"
     sync_argocd_app
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
-    if [[ -n "${LONGHORN_TRANSIENT_VERSION}" ]]; then
-      UPGRADE_LH_REPO_URL="${LONGHORN_REPO_URI}"
-      UPGRADE_LH_REPO_BRANCH="${LONGHORN_TRANSIENT_VERSION}"
-      UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${LONGHORN_TRANSIENT_VERSION}"
-      run_longhorn_upgrade_test
-      LONGHORN_UPGRADE_TYPE="from_transient"
-      LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-transient"
-    fi
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${LONGHORN_TRANSIENT_VERSION}"
     UPGRADE_LH_REPO_URL="${LONGHORN_REPO_URI}"
     UPGRADE_LH_REPO_BRANCH="${LONGHORN_INSTALL_VERSION}"
     UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${LONGHORN_INSTALL_VERSION}"

diff --git a/pipelines/e2e/Jenkinsfile b/pipelines/e2e/Jenkinsfile
@@ -162,14 +162,9 @@ node {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/junit.html ."
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/report.html ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.LONGHORN_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
                 else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = robot outputPath: '.'

diff --git a/pipelines/fleet/Jenkinsfile b/pipelines/fleet/Jenkinsfile
@@ -93,14 +93,9 @@ node {
             stage ('report generation') {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-junit-report.xml ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.FLEET_REPO_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
-                else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                if(params.LONGHORN_UPGRADE_TEST) {
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/fleet/scripts/longhorn-setup.sh b/pipelines/fleet/scripts/longhorn-setup.sh
@@ -37,16 +37,8 @@ main(){
 
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     create_fleet_git_repo "${FLEET_REPO_STABLE_VERSION}"
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
-    if [[ -n "${FLEET_REPO_TRANSIENT_VERSION}" ]]; then
-      UPGRADE_LH_REPO_URL="${FLEET_REPO_URI}"
-      UPGRADE_LH_REPO_BRANCH="${FLEET_REPO_TRANSIENT_VERSION}"
-      UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${FLEET_REPO_TRANSIENT_VERSION}"
-      run_longhorn_upgrade_test
-      LONGHORN_UPGRADE_TYPE="from_transient"
-      LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-transient"
-    fi
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${FLEET_REPO_TRANSIENT_VERSION}"
     UPGRADE_LH_REPO_URL="${FLEET_REPO_URI}"
     UPGRADE_LH_REPO_BRANCH="${FLEET_REPO_VERSION}"
     UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${FLEET_REPO_VERSION}"

diff --git a/pipelines/flux/Jenkinsfile b/pipelines/flux/Jenkinsfile
@@ -128,14 +128,9 @@ node {
             stage ('report generation') {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-junit-report.xml ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.LONGHORN_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
-                else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                if(params.LONGHORN_UPGRADE_TEST) {
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/flux/scripts/longhorn-setup.sh b/pipelines/flux/scripts/longhorn-setup.sh
@@ -43,16 +43,8 @@ main(){
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     create_flux_helm_repo "${HELM_CHART_DEFAULT_URL}"
     create_flux_helm_release "${LONGHORN_STABLE_VERSION}"
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
-    if [[ -n "${LONGHORN_TRANSIENT_VERSION}" ]]; then
-      FLUX_HELM_CHART_URL="${HELM_CHART_DEFAULT_URL}"
-      FLUX_HELM_CHART_VERSION="${LONGHORN_TRANSIENT_VERSION}"
-      UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${LONGHORN_TRANSIENT_VERSION}"
-      run_longhorn_upgrade_test
-      LONGHORN_UPGRADE_TYPE="from_transient"
-      LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-transient"
-    fi
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${LONGHORN_TRANSIENT_VERSION}"
     FLUX_HELM_CHART_URL="${HELM_CHART_URL}"
     FLUX_HELM_CHART_VERSION="${LONGHORN_INSTALL_VERSION}"
     UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${LONGHORN_INSTALL_VERSION}"

diff --git a/pipelines/gke/Jenkinsfile b/pipelines/gke/Jenkinsfile
@@ -63,8 +63,8 @@ node {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${TF_VAR_tf_workspace}/longhorn-test-junit-report.xml ."
 
                 if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${TF_VAR_tf_workspace}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${TF_VAR_tf_workspace}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/gke/scripts/longhorn-setup.sh b/pipelines/gke/scripts/longhorn-setup.sh
@@ -300,8 +300,8 @@ main(){
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     generate_longhorn_yaml_manifest "${TF_VAR_tf_workspace}"
     install_longhorn_stable
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${LONGHORN_TRANSIENT_VERSION}"
     UPGRADE_LH_REPO_URL="${LONGHORN_REPO_URI}"
     UPGRADE_LH_REPO_BRANCH="${LONGHORN_REPO_BRANCH}"
     UPGRADE_LH_MANAGER_IMAGE="${CUSTOM_LONGHORN_MANAGER_IMAGE}"

diff --git a/pipelines/helm/Jenkinsfile b/pipelines/helm/Jenkinsfile
@@ -136,14 +136,9 @@ node {
             stage ('report generation') {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-junit-report.xml ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.LONGHORN_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
-                else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                if(params.LONGHORN_UPGRADE_TEST) {
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/helm/scripts/longhorn-setup.sh b/pipelines/helm/scripts/longhorn-setup.sh
@@ -50,16 +50,8 @@ main(){
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     get_longhorn_chart "${LONGHORN_STABLE_VERSION}"
     install_longhorn
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
-    if [[ -n "${LONGHORN_TRANSIENT_VERSION}" ]]; then
-      UPGRADE_LH_REPO_URL="${LONGHORN_REPO_URI}"
-      UPGRADE_LH_REPO_BRANCH="${LONGHORN_TRANSIENT_VERSION}"
-      UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:${LONGHORN_TRANSIENT_VERSION}"
-      run_longhorn_upgrade_test
-      LONGHORN_UPGRADE_TYPE="from_transient"
-      LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-transient"
-    fi
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${LONGHORN_TRANSIENT_VERSION}"
     UPGRADE_LH_REPO_URL="${LONGHORN_REPO_URI}"
     UPGRADE_LH_REPO_BRANCH="${LONGHORN_REPO_BRANCH}"
     UPGRADE_LH_MANAGER_IMAGE="${CUSTOM_LONGHORN_MANAGER_IMAGE}"

diff --git a/pipelines/rancher/Jenkinsfile b/pipelines/rancher/Jenkinsfile
@@ -137,14 +137,9 @@ node {
             stage ('report generation') {
                 sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-junit-report.xml ."
 
-                if(params.LONGHORN_UPGRADE_TEST && params.LONGHORN_TRANSIENT_VERSION) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-transient-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-upgrade-from-transient-junit-report.xml, longhorn-test-junit-report.xml'
-                }
-                else if(params.LONGHORN_UPGRADE_TEST) {
-                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-from-stable-junit-report.xml ."
-                    summary = junit 'longhorn-test-upgrade-from-stable-junit-report.xml, longhorn-test-junit-report.xml'
+                if(params.LONGHORN_UPGRADE_TEST) {
+                    sh "docker cp ${JOB_BASE_NAME}-${BUILD_NUMBER}:${WORKSPACE}/longhorn-test-upgrade-junit-report.xml ."
+                    summary = junit 'longhorn-test-upgrade-junit-report.xml, longhorn-test-junit-report.xml'
                 }
                 else {
                     summary = junit 'longhorn-test-junit-report.xml'

diff --git a/pipelines/rancher/scripts/longhorn-setup.sh b/pipelines/rancher/scripts/longhorn-setup.sh
@@ -42,22 +42,10 @@ main(){
 
   if [[ "${LONGHORN_UPGRADE_TEST}" == true ]]; then
     install_longhorn_rancher_chart "${LONGHORN_STABLE_VERSION}"
-    LONGHORN_UPGRADE_TYPE="from_stable"
-    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-stable"
-    if [[ -n "${LONGHORN_TRANSIENT_VERSION}" ]]; then
-      RANCHER_CHART_INSTALL_VERSION="${LONGHORN_TRANSIENT_VERSION}"
-      # extract 1.4.2 from 102.2.1+up1.4.2
-      RAW_VERSION=(${LONGHORN_TRANSIENT_VERSION/up/ })
-      if [[ "${LONGHORN_REPO}" == "rancher" ]]; then
-        UPGRADE_LH_ENGINE_IMAGE="rancher/mirrored-longhornio-longhorn-engine:v${RAW_VERSION[1]}"
-      else
-        UPGRADE_LH_ENGINE_IMAGE="longhornio/longhorn-engine:v${RAW_VERSION[1]}"
-      fi
-      run_longhorn_upgrade_test
-      LONGHORN_UPGRADE_TYPE="from_transient"
-      LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade-from-transient"
-    fi
+    LONGHORN_UPGRADE_TEST_POD_NAME="longhorn-test-upgrade"
+    UPGRADE_LH_TRANSIENT_VERSION="${LONGHORN_TRANSIENT_VERSION}"
     RANCHER_CHART_INSTALL_VERSION="${LONGHORN_INSTALL_VERSION}"
+    # extract 1.4.2 from 102.2.1+up1.4.2
     RAW_VERSION=(${LONGHORN_INSTALL_VERSION/up/ })
     if [[ "${LONGHORN_REPO}" == "rancher" ]]; then
         UPGRADE_LH_ENGINE_IMAGE="rancher/mirrored-longhornio-longhorn-engine:v${RAW_VERSION[1]}"