From 672a427d8d22227b68f0067b2bdb1f502b6d6692 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 5 Jul 2017 14:24:33 +0200 Subject: [PATCH] ceph-ansible-prs: do not run bluestore on luminous MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a bit hacky but I don't know any other ways to achieve that. Signed-off-by: Sébastien Han --- .../config/definitions/ceph-ansible-prs.yml | 107 ++++++++++++++++-- 1 file changed, 95 insertions(+), 12 deletions(-) diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index f1805d14..7373731e 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -1,10 +1,26 @@ - project: name: ceph-ansible-prs - release: + release_before_luminous: - jewel - kraken + release_after_luminous: - luminous - scenario: + scenario_before_luminous: + - ansible2.2-centos7_cluster + - ansible2.2-xenial_cluster + - ansible2.2-journal_collocation + - ansible2.2-dmcrypt_journal + - ansible2.2-dmcrypt_journal_collocation + - ansible2.2-docker_cluster + - ansible2.2-docker_dedicated_journal + - ansible2.2-docker_dmcrypt_journal_collocation + - ansible2.2-purge_cluster + - ansible2.2-purge_dmcrypt + - ansible2.2-update_dmcrypt + - ansible2.2-update_cluster + - ansible2.2-purge_docker_cluster + - ansible2.2-update_docker_cluster + scenario_after_luminous: - ansible2.2-centos7_cluster - ansible2.2-xenial_cluster - ansible2.2-journal_collocation @@ -24,15 +40,82 @@ - ansible2.2-bluestore_dmcrypt_journal - ansible2.2-bluestore_dmcrypt_journal_collocation jobs: - - 'ceph-ansible-prs-{release}-{scenario}' + - 'ceph-ansible-prs-{release_before_luminous}-{scenario_before_luminous}' + - 'ceph-ansible-prs-{release_after_luminous}-{scenario_after_luminous}' + +- job-template: + name: 'ceph-ansible-prs-{release_before_luminous}-{scenario_before_luminous}' + node: vagrant&&libvirt + concurrent: true + defaults: global + display-name: 'ceph-ansible: Pull Requests [{release_before_luminous}-{scenario_before_luminous}]' + quiet-period: 5 + block-downstream: false + block-upstream: false + retry-count: 3 + properties: + - github: + url: https://github.com/ceph/ceph-ansible + logrotate: + daysToKeep: 15 + numToKeep: -1 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - string: + name: sha1 + description: "A pull request ID, like 'origin/pr/72/head'" + triggers: + - github-pull-request: + allow-whitelist-orgs-as-admins: true + org-list: + - ceph + trigger-phrase: 'jenkins test {release_before_luminous}-{scenario_before_luminous}' + only-trigger-phrase: false + github-hooks: true + permit-all: true + auto-close-on-fail: false + status-context: "Testing: {release_before_luminous}-{scenario_before_luminous}" + started-status: "Running: {release_before_luminous}-{scenario_before_luminous}" + success-status: "OK - {release_before_luminous}-{scenario_before_luminous}" + failure-status: "FAIL - {release_before_luminous}-{scenario_before_luminous}" + + scm: + - git: + url: https://github.com/ceph/ceph-ansible.git + branches: + - ${{sha1}} + refspec: +refs/pull/*:refs/remotes/origin/pr/* + browser: auto + timeout: 20 + skip-tag: true + wipe-workspace: false + + builders: + - inject: + properties-content: | + SCENARIO={scenario_before_luminous} + RELEASE={release_before_luminous} + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/build + + publishers: + - postbuildscript: + script-only-if-succeeded: False + script-only-if-failed: True + builders: + - shell: !include-raw ../../build/teardown - job-template: - name: 'ceph-ansible-prs-{release}-{scenario}' + name: 'ceph-ansible-prs-{release_after_luminous}-{scenario_after_luminous}' node: vagrant&&libvirt concurrent: true defaults: global - display-name: 'ceph-ansible: Pull Requests [{release}-{scenario}]' + display-name: 'ceph-ansible: Pull Requests [{release_after_luminous}-{scenario_after_luminous}]' quiet-period: 5 block-downstream: false block-upstream: false @@ -56,15 +139,15 @@ allow-whitelist-orgs-as-admins: true org-list: - ceph - trigger-phrase: 'jenkins test {release}-{scenario}' + trigger-phrase: 'jenkins test {release_after_luminous}-{scenario_after_luminous}' only-trigger-phrase: false github-hooks: true permit-all: true auto-close-on-fail: false - status-context: "Testing: {release}-{scenario}" - started-status: "Running: {release}-{scenario}" - success-status: "OK - {release}-{scenario}" - failure-status: "FAIL - {release}-{scenario}" + status-context: "Testing: {release_after_luminous}-{scenario_after_luminous}" + started-status: "Running: {release_after_luminous}-{scenario_after_luminous}" + success-status: "OK - {release_after_luminous}-{scenario_after_luminous}" + failure-status: "FAIL - {release_after_luminous}-{scenario_after_luminous}" scm: - git: @@ -80,8 +163,8 @@ builders: - inject: properties-content: | - SCENARIO={scenario} - RELEASE={release} + SCENARIO={scenario_after_luminous} + RELEASE={release_after_luminous} - shell: !include-raw-escape: - ../../../scripts/build_utils.sh -- 2.39.5