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:
parent
e863695018
commit
fb6c0c9876
3 changed files with 37 additions and 14 deletions
|
|
@ -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:
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue