Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit 6c61380

Browse files
committed
Merge branch 'feature/stashv2' of github.com:v1v/apm-pipeline-library into feature/stashv2
* 'feature/stashv2' of github.com:v1v/apm-pipeline-library: Write credentials for opbot (#529) Add flake detector to pipeline (#530)
2 parents ccbef8b + dce5627 commit 6c61380

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

.ci/buildDockerImages.groovy

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ pipeline {
5353
booleanParam(name: 'apm_integration_testing', defaultValue: "false", description: "")
5454
booleanParam(name: 'helm_kubectl', defaultValue: "false", description: "")
5555
booleanParam(name: 'opbot', defaultValue: "false", description: "")
56+
booleanParam(name: 'flakey', defaultValue: "false", description: "Flake detection app")
5657
}
5758
stages {
5859
stage('Cache Weblogic Docker Image'){
@@ -312,6 +313,24 @@ pipeline {
312313
push: true)
313314
}
314315
}
316+
stage('Build flakey'){
317+
options {
318+
skipDefaultCheckout()
319+
}
320+
when{
321+
beforeAgent true
322+
expression { return params.flakey}
323+
}
324+
steps {
325+
deleteDir()
326+
buildDockerImage(
327+
repo: 'https://github.com/elastic/observability-dev',
328+
tag: 'flakey',
329+
version: 'latest',
330+
push: true,
331+
folder: "apps/automation/jenkins-toolbox")
332+
}
333+
}
315334
stage('Build opbot'){
316335
options {
317336
skipDefaultCheckout()
@@ -323,12 +342,23 @@ pipeline {
323342
steps {
324343
deleteDir()
325344
dockerLoginElasticRegistry()
345+
dir("opbot-latest"){
346+
script {
347+
def creds = getVaultSecret('secret/k8s/elastic-apps/apm/opbot-google-creds')
348+
writeFile(file: 'credentials.json', text: creds.data.value)
349+
}
350+
}
326351
buildDockerImage(
327352
repo: 'https://github.com/elastic/opbot.git',
328353
tag: "opbot",
329354
version: "latest",
330355
push: true)
331356
}
357+
post {
358+
cleanup {
359+
deleteDir()
360+
}
361+
}
332362
}
333363
}
334364
post {

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ local.log
2929
.classpath
3030
.project
3131
.settings/
32+
33+
test-infra/apm-ci/__pycache__/

0 commit comments

Comments
 (0)