commit 80d45b23709005c9ca63136a0a8f3bf41d412f9c
author Denis Egorenko <degorenko@mirantis.com> Thu Jan 31 22:28:38 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Fri Feb 01 15:16:24 2019 +0400
tree e27fb37817fe2c62fd4359f3606237cef25005dc
parent 42ea661cebe9d00e294ff75d191fc23d87de294e

Prevent test-wrapper from running backward compatibility tests on gate mode

Also drop redundant code for checking gate inside test-cookiecutter job, as
now it's checking in test-wrapper.

Change-Id: I227d52a8ecea4b587330370ecd695c377aca82e7

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index f5f0622..8076041 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -31,7 +31,6 @@
 checkIncludeOrder = env.CHECK_INCLUDE_ORDER ?: false
 
 // Global var's
-alreadyMerged = false
 gerritConData = [credentialsId       : env.CREDENTIALS_ID,
                  gerritName          : env.GERRIT_NAME ?: 'mcp-jenkins',
                  gerritHost          : env.GERRIT_HOST ?: 'gerrit.mcp.mirantis.com',
@@ -114,30 +113,16 @@
 def StepPrepareGit(templateEnvFolder, gerrit_data) {
     // return git clone  object
     return {
-        def checkouted = false
         common.infoMsg("StepPrepareGit: ${gerrit_data}")
         // fetch needed sources
         dir(templateEnvFolder) {
-            if (gerrit_data['gerritRefSpec']) {
-                // Those part might be not work,in case manual var's pass
-                def gerritChange = gerrit.getGerritChange(gerrit_data['gerritName'], gerrit_data['gerritHost'],
-                    gerrit_data['GERRIT_CHANGE_NUMBER'], gerrit_data['credentialsId'])
-                merged = gerritChange.status == "MERGED"
-                if (!merged) {
-                    checkouted = gerrit.gerritPatchsetCheckout(gerrit_data)
-                } else {
-                    // update global variable for pretty return from pipeline
-                    alreadyMerged = true
-                    common.successMsg("Change ${gerrit_data['GERRIT_CHANGE_NUMBER']} is already merged, no need to gate them")
-                    error('change already merged')
-                }
-            } else {
+            if (! gerrit_data['gerritRefSpec']) {
                 // Get clean HEAD
                 gerrit_data['useGerritTriggerBuildChooser'] = false
-                checkouted = gerrit.gerritPatchsetCheckout(gerrit_data)
-                if (!checkouted) {
-                    error("Failed to get repo:${gerrit_data}")
-                }
+            }
+            def checkouted = gerrit.gerritPatchsetCheckout(gerrit_data)
+            if (!checkouted) {
+                error("Failed to get repo:${gerrit_data}")
             }
         }
     }
@@ -450,11 +435,6 @@
             sh(script: 'find . -mindepth 1 -delete > /dev/null || true')
 
         } catch (Throwable e) {
-            if (alreadyMerged) {
-                currentBuild.result = 'ABORTED'
-                currentBuild.description = "Change ${GERRIT_CHANGE_NUMBER} is already merged, no need to gate them"
-                return
-            }
             currentBuild.result = "FAILURE"
             currentBuild.description = currentBuild.description ? e.message + " " + currentBuild.description : e.message
             throw e