Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #459 from jmlrt/apm-chart-ci-tests
Browse files Browse the repository at this point in the history
[apm-server] add ci tests for apm-server chart
  • Loading branch information
jmlrt authored Jan 24, 2020
2 parents 13d7284 + c956caa commit 3a086e9
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 0 deletions.
39 changes: 39 additions & 0 deletions .ci/jobs/elastic+helm-charts+master+integration-apm-server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
- job:
name: elastic+helm-charts+master+integration-apm-server
display-name: elastic / helm-charts - master - integration apm-server
description: Master - integration apm-server
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- axis:
type: yaml
name: APM_SERVER_SUITE
filename: helpers/matrix.yml
- axis:
type: yaml
name: KUBERNETES_VERSION
filename: helpers/matrix.yml
builders:
- shell: |-
#!/usr/local/bin/runbld
set -euo pipefail
source /usr/local/bin/bash_standard_lib.sh
set +x
VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
export VAULT_TOKEN
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x
cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
2 changes: 2 additions & 0 deletions .ci/jobs/elastic+helm-charts+master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
current-parameters: true
- name: elastic+helm-charts+master+integration-logstash
current-parameters: true
- name: elastic+helm-charts+master+integration-apm-server
current-parameters: true
publishers:
- trigger-parameterized-builds:
- project: elastic+helm-charts+master+cluster-cleanup
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
- job:
name: elastic+helm-charts+pull-request+integration-apm-server
display-name: elastic / helm-charts - pull-request - integration apm-server
description: Pull request - integration apm-server
scm:
- git:
refspec: +refs/pull/*:refs/remotes/origin/pr/*
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- axis:
type: yaml
name: APM_SERVER_SUITE
filename: helpers/matrix.yml
- axis:
type: yaml
name: KUBERNETES_VERSION
filename: helpers/matrix.yml
builders:
- shell: |-
#!/usr/local/bin/runbld
set -euo pipefail
source /usr/local/bin/bash_standard_lib.sh
set +x
VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
export VAULT_TOKEN
unset VAULT_ROLE_ID VAULT_SECRET_ID
set -x
cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
3 changes: 3 additions & 0 deletions .ci/jobs/elastic+helm-charts+pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
- name: elastic+helm-charts+pull-request+integration-logstash
current-parameters: true
predefined-parameters: branch_specifier=${ghprbActualCommit}
- name: elastic+helm-charts+pull-request+integration-apm-server
current-parameters: true
predefined-parameters: branch_specifier=${ghprbActualCommit}
publishers:
- trigger-parameterized-builds:
- project: elastic+helm-charts+pull-request+cluster-cleanup
Expand Down
5 changes: 5 additions & 0 deletions helpers/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ LOGSTASH_SUITE:
- oss
- elasticsearch
- 6.x
APM_SERVER_SUITE:
- default
- oss
- security
- 6.x
KUBERNETES_VERSION:
- '1.13'
- '1.14'
Expand Down

0 comments on commit 3a086e9

Please sign in to comment.