Merge branch 'master' into feature/stashv2

Author: v1v

.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: true,
+          folder: "apps/automation/jenkins-toolbox")
+      }
+    }
     stage('Build opbot'){
       options {
         skipDefaultCheckout()
@@ -323,12 +342,23 @@ pipeline {
       steps {
         deleteDir()
         dockerLoginElasticRegistry()
+        dir("opbot-latest"){
+          script {
+            def creds = getVaultSecret('secret/k8s/elastic-apps/apm/opbot-google-creds')
+            writeFile(file: 'credentials.json', text: creds.data.value)
+          }
+        }
         buildDockerImage(
           repo: 'https://github.com/elastic/opbot.git',
           tag: "opbot",
           version: "latest",
           push: true)
       }
+      post {
+        cleanup {
+          deleteDir()
+        }
+      }
     }
   }
   post {

.gitignore

@@ -29,3 +29,5 @@ local.log
 .classpath
 .project
 .settings/
+
+test-infra/apm-ci/__pycache__/