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

Commit

Permalink
Merge branch 'master' into logstash-security
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlrt committed Jun 17, 2020
2 parents 90fc043 + 00f10e3 commit fd78d24
Show file tree
Hide file tree
Showing 198 changed files with 9,023 additions and 2,597 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
22 changes: 22 additions & 0 deletions .ci/jobs/elastic+helm-charts+master+template-lint-python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
- job:
name: elastic+helm-charts+master+lint-python
display-name: elastic / helm-charts - master - lint python
description: Master - lint python
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual&&ubuntu-18.04
builders:
- shell: |-
#!/usr/local/bin/runbld
set -euo pipefail
virtualenv -p python3 venv && source venv/bin/activate
pip install -r requirements.txt
make lint-python
4 changes: 4 additions & 0 deletions .ci/jobs/elastic+helm-charts+master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
projects:
- name: elastic+helm-charts+master+template-testing
current-parameters: true
- name: elastic+helm-charts+master+lint-python
current-parameters: true
- name: elastic+helm-charts+master+cluster-creation
current-parameters: true
- multijob:
Expand All @@ -37,6 +39,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
22 changes: 22 additions & 0 deletions .ci/jobs/elastic+helm-charts+pull-request+lint-python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
- job:
name: elastic+helm-charts+pull-request+lint-python
display-name: elastic / helm-charts - pull-request - lint python
description: Pull request - lint python
scm:
- git:
refspec: +refs/pull/*:refs/remotes/origin/pr/*
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual&&ubuntu-18.04
builders:
- shell: |-
#!/usr/local/bin/runbld
set -euo pipefail
virtualenv -p python3 venv && source venv/bin/activate
pip install -r requirements.txt
make lint-python
6 changes: 6 additions & 0 deletions .ci/jobs/elastic+helm-charts+pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
- name: elastic+helm-charts+pull-request+template-testing
current-parameters: true
predefined-parameters: branch_specifier=${ghprbActualCommit}
- name: elastic+helm-charts+pull-request+lint-python
current-parameters: true
predefined-parameters: branch_specifier=${ghprbActualCommit}
- name: elastic+helm-charts+pull-request+cluster-creation
current-parameters: true
predefined-parameters: branch_specifier=${ghprbActualCommit}
Expand All @@ -54,6 +57,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
39 changes: 39 additions & 0 deletions .ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
- job:
name: elastic+helm-charts+staging+cluster-cleanup
display-name: elastic / helm-charts - staging - cluster cleanup
description: staging - cluster cleanup
parameters:
- string:
name: BUILD_ID
description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- 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//./}-${BUILD_ID//./-}"
cd helpers/terraform/
./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
40 changes: 40 additions & 0 deletions .ci/jobs/elastic+helm-charts+staging+cluster-creation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
- job:
name: elastic+helm-charts+staging+cluster-creation
display-name: elastic / helm-charts - staging - cluster creation
description: staging - cluster creation
parameters:
- string:
name: BUILD_ID
description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- 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//./}-${BUILD_ID//./-}"
cd helpers/terraform/
./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
./in-docker make k8s-staging-registry KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
45 changes: 45 additions & 0 deletions .ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
- job:
name: elastic+helm-charts+staging+integration-apm-server
display-name: elastic / helm-charts - staging - integration apm-server
description: staging - integration apm-server
parameters:
- string:
name: BUILD_ID
description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
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
env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
54 changes: 54 additions & 0 deletions .ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
- job:
name: elastic+helm-charts+staging+integration-elasticsearch
display-name: elastic / helm-charts - staging - integration elasticsearch
description: staging - integration elasticsearch
parameters:
- string:
name: BUILD_ID
description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- axis:
type: yaml
name: ES_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
DOCKER_PASSWORD=$(retry 5 vault read -field password secret/devops-ci/docker.elastic.co/devops-ci)
retry 5 docker login -u devops-ci -p $DOCKER_PASSWORD docker.elastic.co
unset DOCKER_PASSWORD
set -x
env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
cd helpers/terraform/
# pull private images while we have the hosts docker daemon authenticated
make pull-private-images
# the private images will be used in here
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
45 changes: 45 additions & 0 deletions .ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
- job:
name: elastic+helm-charts+staging+integration-filebeat
display-name: elastic / helm-charts - staging - integration filebeat
description: staging - integration filebeat
parameters:
- string:
name: BUILD_ID
description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
scm:
- git:
wipe-workspace: 'True'
axes:
- axis:
type: slave
name: label
values:
- docker&&virtual
- axis:
type: yaml
name: FILEBEAT_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
env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
cd helpers/terraform/
./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
Loading

0 comments on commit fd78d24

Please sign in to comment.