Merge branch 'master' into arm-suppport

mdelapenya · web-flow · commit aa09c0e34416 · 2021-06-01T07:47:21.000+02:00
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -258,7 +258,7 @@ def checkTestSuite(Map parallelTasks = [:], Map item = [:]) {
     }
     def pullRequestFilter = scenario.containsKey('pullRequestFilter') ? scenario.pullRequestFilter : ''
     def tags = scenario.tags
-    def regexps = [ "^e2e/_suites/${suite}/.*", "^.ci/.*", "^cli/.*", "^e2e/.*\\.go" ]
+    def regexps = [ "^e2e/_suites/${suite}/.*", "^.ci/.*", "^cli/.*", "^e2e/.*\\.go", "^internal/.*\\.go" ]
     if ("${FORCE_SKIP_GIT_CHECKS}" == "true" || isGitRegionMatch(patterns: regexps, shouldMatchAll: false)) {
       platformsValue.each { platform ->
         log(level: 'INFO', text: "Adding ${platform}:${suite}:${tags} test suite to the build execution")
diff --git a/internal/kibana/integrations.go b/internal/kibana/integrations.go
@@ -12,7 +12,7 @@ import (
 
 // IntegrationPackage used to share information about a integration
 type IntegrationPackage struct {
-	ID      string `json:"id,omitempty"`
+	ID      string `json:"-"`
 	Name    string `json:"name"`
 	Title   string `json:"title"`
 	Version string `json:"version"`

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ def checkTestSuite(Map parallelTasks = [:], Map item = [:]) {`
`258`	`258`	`}`
`259`	`259`	`def pullRequestFilter = scenario.containsKey('pullRequestFilter') ? scenario.pullRequestFilter : ''`
`260`	`260`	`def tags = scenario.tags`
`261`		`- def regexps = [ "^e2e/_suites/${suite}/.", "^.ci/.", "^cli/.", "^e2e/.\\.go" ]`
	`261`	`+ def regexps = [ "^e2e/_suites/${suite}/.", "^.ci/.", "^cli/.", "^e2e/.\\.go", "^internal/.*\\.go" ]`
`262`	`262`	`if ("${FORCE_SKIP_GIT_CHECKS}" == "true" \|\| isGitRegionMatch(patterns: regexps, shouldMatchAll: false)) {`
`263`	`263`	`platformsValue.each { platform ->`
`264`	`264`	`log(level: 'INFO', text: "Adding ${platform}:${suite}:${tags} test suite to the build execution")`