super-linter seems to be broken (#709)

elastic · Sep 3, 2020 · 1330d4e · 1330d4e
1 parent eb158ec
commit 1330d4e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 9 deletions.
diff --git a/src/test/groovy/SuperLinterStepTests.groovy b/src/test/groovy/SuperLinterStepTests.groovy
@@ -26,6 +26,9 @@ class SuperLinterStepTests extends ApmBasePipelineTest {
   @Before
   void setUp() throws Exception {
     super.setUp()
+    helper.registerAllowedMethod('sh', [Map.class], { m ->
+      return 0
+    })
   }
 
   @Test
@@ -75,7 +78,7 @@ class SuperLinterStepTests extends ApmBasePipelineTest {
   }
 
   @Test
-  void test_with_installation_error() throws Exception {
+  void test_with_installation_error_with_not_failNever() throws Exception {
     def script = loadScript(scriptName)
     env.GIT_BASE_COMMIT = 'bar'
     helper.registerAllowedMethod('sh', [Map.class], { m ->
@@ -84,7 +87,7 @@ class SuperLinterStepTests extends ApmBasePipelineTest {
       }
     })
     try {
-      script.call()
+      script.call(failNever: false)
     } catch(e) {
       // NOOP
     }
@@ -93,4 +96,42 @@ class SuperLinterStepTests extends ApmBasePipelineTest {
     assertTrue(assertMethodCallContainsPattern('sh', "label=Install super-linter"))
     assertJobStatusFailure()
   }
+
+  @Test
+  void test_with_superlinter_error_and_not_failNever() throws Exception {
+    def script = loadScript(scriptName)
+    env.GIT_BASE_COMMIT = 'bar'
+    helper.registerAllowedMethod('sh', [Map.class], { m ->
+      if(m?.label?.contains('Run super-linter')){
+        return 1
+      }
+    })
+    try {
+      script.call(failNever: false)
+    } catch(e) {
+      // NOOP
+    }
+    printCallStack()
+    assertTrue(assertMethodCallContainsPattern('error', 'Super linter failed'))
+    assertJobStatusFailure()
+  }
+
+  @Test
+  void test_with_superlinter_error_and_failNever() throws Exception {
+    def script = loadScript(scriptName)
+    env.GIT_BASE_COMMIT = 'bar'
+    helper.registerAllowedMethod('sh', [Map.class], { m ->
+      if(m?.label?.contains('Run super-linter')){
+        return 1
+      }
+    })
+    try {
+      script.call(failNever: true)
+    } catch(e) {
+      // NOOP
+    }
+    printCallStack()
+    assertTrue(assertMethodCallOccurrences('error', 0))
+    assertJobStatusSuccess()
+  }
 }
diff --git a/vars/superLinter.groovy b/vars/superLinter.groovy
@@ -36,16 +36,19 @@ def call(Map args = [:]) {
   varsEnv.each {
     envFlags += " -e ${it}"
   }
-  sh(label: 'Run super-linter', script: """
-    docker run ${envFlags} \
-      -e OUTPUT_FORMAT=tap -e OUTPUT_DETAILS=detailed -e OUTPUT_FOLDER=${output} \
-      -v \$(pwd):/tmp/lint \
-      -u \$(id -u):\$(id -g) \
-      ${dockerImage}""")
-
+  def status = sh(label: 'Run super-linter',
+                  script: """
+                  docker run ${envFlags} \
+                    -e OUTPUT_FORMAT=tap -e OUTPUT_DETAILS=detailed -e OUTPUT_FOLDER=${output} \
+                    -v \$(pwd):/tmp/lint \
+                    -u \$(id -u):\$(id -g) \
+                    ${dockerImage}""", returnStatus: true)
   if(junitFlag) {
     dir("${output}") {
       tap2Junit(pattern: '*.tap', package: 'super-linter')
     }
   }
+  if (!failNever && status != 0) {
+    error 'Super linter failed'
+  }
 }