Undo changes for testing

elastic · Oct 30, 2020 · 7368ce6 · 7368ce6
1 parent c7e7565
commit 7368ce6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
@@ -3,4 +3,4 @@
 set -e
 
 ./.ci/packer_cache_for_branch.sh master
-# ./.ci/packer_cache_for_branch.sh 7.x # TODO uncomment before merge
+./.ci/packer_cache_for_branch.sh 7.x
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,14 +3,19 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-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')
-
-      kibanaPipeline.bash("""
-        ./.ci/build_docker.sh
-      """, "Testing bootstrap cache")
+kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
+  slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
+    githubPr.withDefaultPrComments {
+      ciStats.trackBuild {
+        catchError {
+          retryable.enable()
+          kibanaPipeline.allCiTasks()
+        }
+      }
     }
   }
+
+  if (params.NOTIFY_ON_FAILURE) {
+    kibanaPipeline.sendMail()
+  }
 }