From fda77445b9b05a39345610bb540d7b3be91ec1c1 Mon Sep 17 00:00:00 2001
From: Mike Place <mike.place@elastic.co>
Date: Wed, 13 May 2020 15:16:04 +0200
Subject: [PATCH 1/3] Add flake detector to pipeline

---
 .ci/buildDockerImages.groovy | 19 +++++++++++++++++++
 .gitignore                   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/.ci/buildDockerImages.groovy b/.ci/buildDockerImages.groovy
index df042e5e9..51dc98648 100644
--- a/.ci/buildDockerImages.groovy
+++ b/.ci/buildDockerImages.groovy
@@ -53,6 +53,7 @@ pipeline {
     booleanParam(name: 'apm_integration_testing', defaultValue: "false", description: "")
     booleanParam(name: 'helm_kubectl', defaultValue: "false", description: "")
     booleanParam(name: 'opbot', defaultValue: "false", description: "")
+    booleanParam(name: 'flakey', defaultValue: "false", description: "Flake detection app")
   }
   stages {
     stage('Cache Weblogic Docker Image'){
@@ -312,6 +313,24 @@ pipeline {
           push: true)
       }
     }
+    stage('Build flakey'){
+      options {
+        skipDefaultCheckout()
+      }
+      when{
+        beforeAgent true
+        expression { return params.flakey}
+      }
+      steps {
+        deleteDir()
+        buildDockerImage(
+          repo: 'https://github.com/elastic/observability-dev',
+          tag: 'flakey',
+          version: 'latest',
+          push: false,
+          folder: "apps/automation/jenkins-toolbox"
+      }
+    }
     stage('Build opbot'){
       options {
         skipDefaultCheckout()
diff --git a/.gitignore b/.gitignore
index 575b5414f..7aa539f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ local.log
 .classpath
 .project
 .settings/
+
+test-infra/apm-ci/__pycache__/

From 2e0dfca65512b001e95600f2cab105604c1a86b7 Mon Sep 17 00:00:00 2001
From: Mike Place <mike.place@elastic.co>
Date: Wed, 13 May 2020 15:18:43 +0200
Subject: [PATCH 2/3] Set push to true

---
 .ci/buildDockerImages.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/buildDockerImages.groovy b/.ci/buildDockerImages.groovy
index 51dc98648..760867acd 100644
--- a/.ci/buildDockerImages.groovy
+++ b/.ci/buildDockerImages.groovy
@@ -327,7 +327,7 @@ pipeline {
           repo: 'https://github.com/elastic/observability-dev',
           tag: 'flakey',
           version: 'latest',
-          push: false,
+          push: true,
           folder: "apps/automation/jenkins-toolbox"
       }
     }

From e8db7503bfd1351be52abec7d4bb7161837a943f Mon Sep 17 00:00:00 2001
From: Mike Place <mike.place@elastic.co>
Date: Wed, 13 May 2020 13:32:10 +0000
Subject: [PATCH 3/3] Fix missing paren

---
 .ci/buildDockerImages.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/buildDockerImages.groovy b/.ci/buildDockerImages.groovy
index 760867acd..2d696a105 100644
--- a/.ci/buildDockerImages.groovy
+++ b/.ci/buildDockerImages.groovy
@@ -328,7 +328,7 @@ pipeline {
           tag: 'flakey',
           version: 'latest',
           push: true,
-          folder: "apps/automation/jenkins-toolbox"
+          folder: "apps/automation/jenkins-toolbox")
       }
     }
     stage('Build opbot'){