diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml index 2abf0fb..9e55507 100644 --- a/.ci/jobs/defaults.yml +++ b/.ci/jobs/defaults.yml @@ -29,20 +29,6 @@ url: git@github.com:elastic/ansible-elasticsearch.git basedir: elasticsearch 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: role_id: cff5d4e0-61bf-2497-645f-fcf019d10c13 builders: diff --git a/.ci/jobs/elastic+ansible-elasticsearch+master.yml b/.ci/jobs/elastic+ansible-elasticsearch+master.yml index 64aa21c..16ffc0c 100644 --- a/.ci/jobs/elastic+ansible-elasticsearch+master.yml +++ b/.ci/jobs/elastic+ansible-elasticsearch+master.yml @@ -9,6 +9,24 @@ default: master description: the Git branch specifier to build (<branchName>, <tagName>, <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: - timed: H H(02-04) * * * publishers: diff --git a/.ci/jobs/elastic+ansible-elasticsearch+pull-request.yml b/.ci/jobs/elastic+ansible-elasticsearch+pull-request.yml index ef8ecd1..f11c5db 100644 --- a/.ci/jobs/elastic+ansible-elasticsearch+pull-request.yml +++ b/.ci/jobs/elastic+ansible-elasticsearch+pull-request.yml @@ -3,6 +3,25 @@ name: elastic+ansible-elasticsearch+pull-request display-name: elastic / ansible-elasticsearch - pull-request 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: - git: branches: