From 9f857631d8df2ae5c3d0e89d95958e1636e8e494 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 26 Mar 2019 22:30:20 +0100 Subject: [PATCH] Add "project_name" variable to configure_functional_tests role It will be useful when neutron-functional or neutron-fullstack job will be used in stadium projects like e.g. in neutron-fwaas. Change-Id: I73c446d43e44b8f06c93752ebf98684f165e6fcd Related-Bug: #1804844 --- roles/configure_functional_tests/README.rst | 3 +++ roles/configure_functional_tests/defaults/main.yaml | 1 + roles/configure_functional_tests/tasks/main.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/roles/configure_functional_tests/README.rst b/roles/configure_functional_tests/README.rst index c2e72b40536..66dc0bbcb5d 100644 --- a/roles/configure_functional_tests/README.rst +++ b/roles/configure_functional_tests/README.rst @@ -5,6 +5,9 @@ Configure host to run on it Neutron functional/fullstack tests .. zuul:rolevar:: tests_venv :default: {{ tox_envlist }} +.. zuul:rolevar:: project_name + :default: neutron + .. zuul:rolevar:: base_dir :default: {{ ansible_user_dir }}/src/opendev.org diff --git a/roles/configure_functional_tests/defaults/main.yaml b/roles/configure_functional_tests/defaults/main.yaml index 615b9785085..9cb32a2f806 100644 --- a/roles/configure_functional_tests/defaults/main.yaml +++ b/roles/configure_functional_tests/defaults/main.yaml @@ -1,4 +1,5 @@ tests_venv: "{{ tox_envlist }}" +project_name: "neutron" base_dir: "{{ ansible_user_dir }}/src/opendev.org" gate_dest_dir: "{{ base_dir }}/openstack" devstack_dir: "{{ base_dir }}/openstack/devstack" diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml index 8e4f791de4c..f59d5c1496b 100644 --- a/roles/configure_functional_tests/tasks/main.yaml +++ b/roles/configure_functional_tests/tasks/main.yaml @@ -7,6 +7,7 @@ BASE_DIR={{ base_dir }} GATE_DEST={{ gate_dest_dir }} + PROJECT_NAME={{ project_name }} NEUTRON_PATH={{ neutron_dir }} DEVSTACK_PATH={{ devstack_dir }} VENV={{ tests_venv }}