From 5aebe3bf5a25d01300d0e993c135433ab0313797 Mon Sep 17 00:00:00 2001 From: Rafael Folco Date: Tue, 21 Aug 2018 15:41:20 -0300 Subject: [PATCH] Enable featureset override Projects may want to override tempest runs for a given job: - run_tempest - tempest_whitelist - test_black_regex Fail in case of a non-overridable config. Change-Id: I8ca492ab21f80fec4f6fb2f00cbf0132dd77f836 --- playbooks/tripleo-ci/run-v3.yaml | 16 ++++++++++++ .../templates/featureset-override.j2 | 1 + zuul.d/README.rst | 25 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 playbooks/tripleo-ci/templates/featureset-override.j2 create mode 100644 zuul.d/README.rst diff --git a/playbooks/tripleo-ci/run-v3.yaml b/playbooks/tripleo-ci/run-v3.yaml index 4f61a1816..8c4acb6ef 100644 --- a/playbooks/tripleo-ci/run-v3.yaml +++ b/playbooks/tripleo-ci/run-v3.yaml @@ -46,6 +46,22 @@ - centos-7 name: tripleo CI jobs runner tasks: + - block: + - name: Check overridable settings + fail: + msg: "ERROR: {{ item }} is not overridable." + when: item not in ['run_tempest', 'tempest_whitelist', 'test_black_regex'] + with_items: "{{ featureset_override }}" + - name: Generate featureset overriding file + template: + src: templates/featureset-override.j2 + dest: "{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" + mode: 0755 + force: yes + - name: Include some extra for generating toci scripts + set_fact: + extra_vars: "--extra-vars @{{ tripleo_root }}/tripleo-ci/featureset-override.yaml" + when: featureset_override is defined - name: render toci_gate_test script template: diff --git a/playbooks/tripleo-ci/templates/featureset-override.j2 b/playbooks/tripleo-ci/templates/featureset-override.j2 new file mode 100644 index 000000000..464921f72 --- /dev/null +++ b/playbooks/tripleo-ci/templates/featureset-override.j2 @@ -0,0 +1 @@ +{{ featureset_override | to_nice_yaml( width=50) }} diff --git a/zuul.d/README.rst b/zuul.d/README.rst new file mode 100644 index 000000000..d065bb2e0 --- /dev/null +++ b/zuul.d/README.rst @@ -0,0 +1,25 @@ +Override config +=============== + +featureset override +------------------- + +Take advantage of zuul job config to override featureset settings like +tempest tests that should run. The following settings from the featureset +config can be overriden: + + - `run_tempest`: To run tempest or not (true|false). + - `tempest_whitelist`: List of tests you want to be executed. + - `test_black_regex`: Set of tempest tests to skip. + +Example:: + + - job: + name: tripleo-ci-centos-7-scenario001-multinode-oooq-container + parent: tripleo-ci-multinode + ... + vars: + featureset_override: + run_tempest: true + tempest_whitelist: + - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'