openstack
/
sahara-tests
Code Issues Proposed changes

Merge "More Python 3 jobs: scenario (by default) and devstack"

This commit is contained in:
Zuul 2019-03-28 15:32:03 +00:00 committed by Gerrit Code Review
parent 45985a74e0 a5fee8c71f
commit 80ab67657b
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.zuul.yaml
View File

@ -12,8 +12,9 @@
voting: false voting: false
- openstack-tox-pylint: - openstack-tox-pylint:
voting: false voting: false
- sahara-tests-scenario-runner-py3 - sahara-tests-scenario
- sahara-tests-scenario-v2 - sahara-tests-scenario-v2
- sahara-tests-scenario-py3
- sahara-tests-tempest - sahara-tests-tempest
- sahara-tests-tempest-v2 - sahara-tests-tempest-v2
- sahara-tests-scenario-rocky - sahara-tests-scenario-rocky
@ -22,14 +23,14 @@
gate: gate:
queue: sahara queue: sahara
jobs: jobs:
- sahara-tests-scenario-runner-py3 - sahara-tests-scenario
- sahara-tests-scenario-v2 - sahara-tests-scenario-v2
- sahara-tests-tempest - sahara-tests-tempest
- sahara-tests-tempest-v2 - sahara-tests-tempest-v2
experimental: experimental:
jobs: jobs:
- sahara-tests-scenario-multinode-spark - sahara-tests-scenario-multinode-spark
- sahara-tests-scenario-py3 - sahara-tests-scenario-multinode-spark-py3
- job: - job:
name: sahara-tests-tempest name: sahara-tests-tempest
@ -155,7 +156,7 @@
sahara_plugin: fake sahara_plugin: fake
sahara_plugin_version: '0.1' sahara_plugin_version: '0.1'
sahara_scenario_test_template: fake.yaml.mako sahara_scenario_test_template: fake.yaml.mako
sahara_scenario_tox_env: venv-py2 sahara_scenario_tox_env: venv
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -163,20 +164,10 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- ^sahara_tempest_plugin/.*$ - ^sahara_tempest_plugin/.*$
- job:
name: sahara-tests-scenario-runner-py3
parent: sahara-tests-scenario
description: |
Run scenario tests for Sahara which use Python 3
to run sahara-scenario (but not the OpenStack deployment)
vars:
sahara_scenario_tox_env: venv-py3
- job: - job:
name: sahara-tests-scenario-v2 name: sahara-tests-scenario-v2
parent: sahara-tests-scenario parent: sahara-tests-scenario
vars: vars:
sahara_scenario_tox_env: venv-py3
sahara_scenario_use_api_v2: True sahara_scenario_use_api_v2: True
- job: - job:
@ -243,7 +234,7 @@
name: sahara-tests-scenario-multinode-spark name: sahara-tests-scenario-multinode-spark
description: | description: |
Run scenario tests based on Spark on a multinode Sahara deployment. Run scenario tests based on Spark on a multinode Sahara deployment.
parent: sahara-tests-scenario parent: sahara-tests-scenario-radosgw
nodeset: openstack-two-node nodeset: openstack-two-node
vars: vars:
sahara_image_name: xenial-spark sahara_image_name: xenial-spark
@ -267,3 +258,12 @@
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: 'True' USE_PYTHON3: 'True'
- job:
name: sahara-tests-scenario-multinode-spark-py3
description: |
Run scenario tests on Spark on a multinode Python 3 Sahara deployment.
parent: sahara-tests-scenario-multinode-spark
vars:
devstack_localrc:
USE_PYTHON3: 'True'

1
etc/scenario/gate/spark-1.6.0.yaml.mako
View File

@ -35,5 +35,6 @@ clusters:
- scale - scale
edp_jobs_flow: edp_jobs_flow:
- spark_pi - spark_pi
- spark_wordcount
cluster: cluster:
name: ${cluster_name} name: ${cluster_name}

6
tox.ini
View File

@ -16,6 +16,7 @@ commands = stestr run {posargs}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_* passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_*
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
passenv = OS_* passenv = OS_*
@ -24,11 +25,6 @@ basepython = python2
commands = {posargs} commands = {posargs}
passenv = OS_* passenv = OS_*
[testenv:venv-py3]
basepython = python3
commands = {posargs}
passenv = OS_*
[testenv:cover] [testenv:cover]
basepython = python3 basepython = python3
setenv = setenv =