Merge branch 'master' into baseline-trigger

Author: elasticmachine

.backportrc.json

@@ -25,6 +25,7 @@
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
+    "^v8.0.0$": "master",
     "^v7.9.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }

.ci/Jenkinsfile_coverage

@@ -23,18 +23,25 @@ kibanaPipeline(timeoutMinutes: 240) {
 }
 
 def handleIngestion(timestamp) {
+  def previousSha = handlePreviousSha()
   kibanaPipeline.downloadCoverageArtifacts()
   kibanaCoverage.prokLinks("### Process HTML Links")
   kibanaCoverage.collectVcsInfo("### Collect VCS Info")
   kibanaCoverage.generateReports("### Merge coverage reports")
   kibanaCoverage.uploadCombinedReports()
-  kibanaCoverage.ingest(timestamp, '### Injest && Upload')
+  kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
   kibanaCoverage.uploadCoverageStaticSite(timestamp)
 }
 
+def handlePreviousSha() {
+  def previous = kibanaCoverage.downloadPrevious('### Download OLD Previous')
+  kibanaCoverage.uploadPrevious('### Upload NEW Previous')
+  return previous
+}
+
 def handleFail() {
   def buildStatus = buildUtils.getBuildStatus()
-  if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
+  if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
     slackNotifications.sendFailedBuild(
       channel: '#kibana-qa',
       username: 'Kibana QA'

.ci/Jenkinsfile_visual_baseline

@@ -21,5 +21,6 @@ kibanaPipeline(timeoutMinutes: 120) {
     }
 
     kibanaPipeline.sendMail()
+    slackNotifications.onFailure()
   }
 }

.ci/end2end.groovy

@@ -14,6 +14,7 @@ pipeline {
     HOME = "${env.WORKSPACE}"
     E2E_DIR = 'x-pack/plugins/apm/e2e'
     PIPELINE_LOG_LEVEL = 'DEBUG'
+    KBN_OPTIMIZER_THEMES = 'v7light'
   }
   options {
     timeout(time: 1, unit: 'HOURS')

.ci/es-snapshots/Jenkinsfile_build_es

@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
 timeout(time: 120, unit: 'MINUTES') {
   timestamps {
     ansiColor('xterm') {
-      node(workers.label('s')) {
+      node(workers.label('l')) {
         catchErrors {
           def VERSION
           def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
     "NODE_NAME=",
   ]) {
     sh """
-      ./gradlew -p distribution/archives assemble --parallel
+      ./gradlew -Dbuild.docker=true assemble --parallel
       mkdir -p ${destination}
-      find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
+      find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
+      docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
     """
   }
 }

.ci/packer_cache_for_branch.sh

@@ -46,7 +46,7 @@ echo "Creating bootstrap_cache archive"
 # archive cacheable directories
 mkdir -p "$HOME/.kibana/bootstrap_cache"
 tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
-  x-pack/plugins/reporting/.chromium \
+  .chromium \
   .es \
   .chromedriver \
   .geckodriver;

.ci/pipeline-library/build.gradle

@@ -20,6 +20,7 @@ dependencies {
   implementation 'org.jenkins-ci.plugins.workflow:workflow-step-api:2.19@jar'
   testImplementation 'com.lesfurets:jenkins-pipeline-unit:1.4'
   testImplementation 'junit:junit:4.12'
+  testImplementation 'org.mockito:mockito-core:2.+'
   testImplementation 'org.assertj:assertj-core:3.15+' // Temporary https://github.com/jenkinsci/JenkinsPipelineUnit/issues/209
 }
 

.ci/pipeline-library/src/test/KibanaBasePipelineTest.groovy

@@ -19,9 +19,9 @@ class KibanaBasePipelineTest extends BasePipelineTest {
     env.BUILD_DISPLAY_NAME = "#${env.BUILD_ID}"
 
     env.JENKINS_URL = 'http://jenkins.localhost:8080'
-    env.BUILD_URL = "${env.JENKINS_URL}/job/elastic+kibana+${env.BRANCH_NAME}/${env.BUILD_ID}/"
+    env.BUILD_URL = "${env.JENKINS_URL}/job/elastic+kibana+${env.BRANCH_NAME}/${env.BUILD_ID}/".toString()
 
-    env.JOB_BASE_NAME = "elastic / kibana # ${env.BRANCH_NAME}"
+    env.JOB_BASE_NAME = "elastic / kibana # ${env.BRANCH_NAME}".toString()
     env.JOB_NAME = env.JOB_BASE_NAME
 
     env.WORKSPACE = 'WS'
@@ -31,6 +31,9 @@ class KibanaBasePipelineTest extends BasePipelineTest {
         getBuildStatus: { 'SUCCESS' },
         printStacktrace: { ex -> print ex },
       ],
+      githubPr: [
+        isPr: { false },
+      ],
       jenkinsApi: [ getFailedSteps: { [] } ],
       testUtils: [ getFailures: { [] } ],
     ])

.ci/pipeline-library/src/test/buildState.groovy

@@ -0,0 +1,48 @@
+import org.junit.*
+import static groovy.test.GroovyAssert.*
+
+class BuildStateTest extends KibanaBasePipelineTest {
+  def buildState
+
+  @Before
+  void setUp() {
+    super.setUp()
+
+    buildState = loadScript("vars/buildState.groovy")
+  }
+
+  @Test
+  void 'get() returns existing data'() {
+    buildState.add('test', 1)
+    def actual = buildState.get('test')
+    assertEquals(1, actual)
+  }
+
+  @Test
+  void 'get() returns null for missing data'() {
+    def actual = buildState.get('missing_key')
+    assertEquals(null, actual)
+  }
+
+  @Test
+  void 'add() does not overwrite existing keys'() {
+    assertTrue(buildState.add('test', 1))
+    assertFalse(buildState.add('test', 2))
+
+    def actual = buildState.get('test')
+
+    assertEquals(1, actual)
+  }
+
+  @Test
+  void 'set() overwrites existing keys'() {
+    assertFalse(buildState.has('test'))
+    buildState.set('test', 1)
+    assertTrue(buildState.has('test'))
+    buildState.set('test', 2)
+
+    def actual = buildState.get('test')
+
+    assertEquals(2, actual)
+  }
+}

.ci/pipeline-library/src/test/githubCommitStatus.groovy

@@ -0,0 +1,85 @@
+import org.junit.*
+import static org.mockito.Mockito.*;
+
+class GithubCommitStatusTest extends KibanaBasePipelineTest {
+  def githubCommitStatus
+  def githubApiMock
+  def buildStateMock
+
+  def EXPECTED_STATUS_URL = 'repos/elastic/kibana/statuses/COMMIT_HASH'
+  def EXPECTED_CONTEXT = 'kibana-ci'
+  def EXPECTED_BUILD_URL = 'http://jenkins.localhost:8080/job/elastic+kibana+master/1/'
+
+  interface BuildState {
+    Object get(String key)
+  }
+
+  interface GithubApi {
+    Object post(String url, Map data)
+  }
+
+  @Before
+  void setUp() {
+    super.setUp()
+
+    buildStateMock = mock(BuildState)
+    githubApiMock = mock(GithubApi)
+
+    when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ])
+    when(githubApiMock.post(any(), any())).thenReturn(null)
+
+    props([
+      buildState: buildStateMock,
+      githubApi: githubApiMock,
+    ])
+
+    githubCommitStatus = loadScript("vars/githubCommitStatus.groovy")
+  }
+
+  void verifyStatusCreate(String state, String description) {
+    verify(githubApiMock).post(
+      EXPECTED_STATUS_URL,
+      [
+        'state': state,
+        'description': description,
+        'context': EXPECTED_CONTEXT,
+        'target_url': EXPECTED_BUILD_URL,
+      ]
+    )
+  }
+
+  @Test
+  void 'onStart() should create a pending status'() {
+    githubCommitStatus.onStart()
+    verifyStatusCreate('pending', 'Build started.')
+  }
+
+  @Test
+  void 'onFinish() should create a success status'() {
+    githubCommitStatus.onFinish()
+    verifyStatusCreate('success', 'Build completed successfully.')
+  }
+
+  @Test
+  void 'onFinish() should create an error status for failed builds'() {
+    mockFailureBuild()
+    githubCommitStatus.onFinish()
+    verifyStatusCreate('error', 'Build failed.')
+  }
+
+  @Test
+  void 'onStart() should exit early for PRs'() {
+    prop('githubPr', [ isPr: { true } ])
+
+    githubCommitStatus.onStart()
+    verifyZeroInteractions(githubApiMock)
+  }
+
+  @Test
+  void 'onFinish() should exit early for PRs'() {
+    prop('githubPr', [ isPr: { true } ])
+
+    githubCommitStatus.onFinish()
+    verifyZeroInteractions(githubApiMock)
+  }
+}