From 39c615889ef37a6f2aff340191c8da664eb03db4 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Fri, 30 Oct 2020 11:00:22 -0400
Subject: [PATCH] [CI] Build docker image during packer_cache

---
 .ci/build_docker.sh            | 10 ++++++++++
 .ci/packer_cache_for_branch.sh |  2 ++
 Jenkinsfile                    | 21 ++++++++-------------
 vars/kibanaPipeline.groovy     |  7 +------
 4 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100755 .ci/build_docker.sh

diff --git a/.ci/build_docker.sh b/.ci/build_docker.sh
new file mode 100755
index 00000000000000..1f45182aad8408
--- /dev/null
+++ b/.ci/build_docker.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd "$(dirname "${0}")"
+
+cp /usr/local/bin/runbld ./
+cp /usr/local/bin/bash_standard_lib.sh ./
+
+docker build -t kibana-ci -f ./Dockerfile .
diff --git a/.ci/packer_cache_for_branch.sh b/.ci/packer_cache_for_branch.sh
index ab0ab845b2dc39..6d98f102f5ffee 100755
--- a/.ci/packer_cache_for_branch.sh
+++ b/.ci/packer_cache_for_branch.sh
@@ -57,6 +57,8 @@ find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | x
 
 echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
 
+.ci/build_docker.sh
+
 if [[ "$branch" != "master" ]]; then
   rm --preserve-root -rf "$checkoutDir"
 fi
diff --git a/Jenkinsfile b/Jenkinsfile
index 3b68cde206573a..79a9e913a55a0e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,19 +3,14 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
-  slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
-    githubPr.withDefaultPrComments {
-      ciStats.trackBuild {
-        catchError {
-          retryable.enable()
-          kibanaPipeline.allCiTasks()
-        }
-      }
-    }
-  }
+kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
+  githubPr.withDefaultPrComments {
+    workers.base(name: 'packer-cache', size: 's', ramDisk: false, bootstrapped: false) {
+      kibanaPipeline.bash('./.ci/packer_cache.sh', 'Execute packer_cache')
 
-  if (params.NOTIFY_ON_FAILURE) {
-    kibanaPipeline.sendMail()
+      kibanaPipeline.bash("""
+        ./ci/build_docker.sh
+      """, "Testing bootstrap cache")
+    }
   }
 }
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 28eb94405abbb6..87d0730cedbfcc 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -390,12 +390,7 @@ def scriptTaskDocker(description, script) {
 
 def buildDocker() {
   sh(
-    script: """
-      cp /usr/local/bin/runbld .ci/
-      cp /usr/local/bin/bash_standard_lib.sh .ci/
-      cd .ci
-      docker build -t kibana-ci -f ./Dockerfile .
-    """,
+    script: "./ci/build_docker.sh",
     label: 'Build CI Docker image'
   )
 }