[meta] fix jobs template following #760 (#762)

This commit fix the test job templates following #760.
- add VERSION parameter for 7.x jobs
- move axis to jobs templates
This commit is contained in:
Julien Mailleret 2021-01-27 19:30:00 +01:00 committed by GitHub
parent e863695018
commit fb6c0c9876
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 14 deletions

View file

@ -29,20 +29,6 @@
url: git@github.com:elastic/ansible-elasticsearch.git url: git@github.com:elastic/ansible-elasticsearch.git
basedir: elasticsearch basedir: elasticsearch
wipe-workspace: 'False' wipe-workspace: 'False'
axes:
- axis:
type: slave
name: label
values:
- linux
- axis:
name: OS
filename: elasticsearch/test/matrix.yml
type: yaml
- axis:
name: TEST_TYPE
filename: elasticsearch/test/matrix.yml
type: yaml
vault: vault:
role_id: cff5d4e0-61bf-2497-645f-fcf019d10c13 role_id: cff5d4e0-61bf-2497-645f-fcf019d10c13
builders: builders:

View file

@ -9,6 +9,24 @@
default: master default: master
description: the Git branch specifier to build (<branchName>, <tagName>, description: the Git branch specifier to build (<branchName>, <tagName>,
<commitId>, etc.) <commitId>, etc.)
- string:
name: VERSION
default: 7.x
description: Elasticsearch major version
axes:
- axis:
type: slave
name: label
values:
- linux
- axis:
name: OS
filename: elasticsearch/test/matrix.yml
type: yaml
- axis:
name: TEST_TYPE
filename: elasticsearch/test/matrix.yml
type: yaml
triggers: triggers:
- timed: H H(02-04) * * * - timed: H H(02-04) * * *
publishers: publishers:

View file

@ -3,6 +3,25 @@
name: elastic+ansible-elasticsearch+pull-request name: elastic+ansible-elasticsearch+pull-request
display-name: elastic / ansible-elasticsearch - pull-request display-name: elastic / ansible-elasticsearch - pull-request
description: Pull request testing with test kitchen description: Pull request testing with test kitchen
parameters:
- string:
name: VERSION
default: 7.x
description: Elasticsearch major version
axes:
- axis:
type: slave
name: label
values:
- linux
- axis:
name: OS
filename: elasticsearch/test/matrix.yml
type: yaml
- axis:
name: TEST_TYPE
filename: elasticsearch/test/matrix.yml
type: yaml
scm: scm:
- git: - git:
branches: branches: