summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-09 08:31:46 +0000
committerGerrit Code Review <review@openstack.org>2018-11-09 08:31:46 +0000
commit12a289f1187ab3af656a0d82020328b95585e30c (patch)
tree742f69c27eebaf376af1a3a9da01859deba6aae1
parent7070aa8a0b2ef345c98d1ab33b4b584991f64047 (diff)
parentcccbde6712f28fe3f118790130ae0d5e4bb5be51 (diff)
Merge "Add zuul job: freezer-tempest-agent"
-rw-r--r--.zuul.yaml22
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/__init__.py (renamed from freezer_tempest_plugin/tests/freezer/api/__init__.py)0
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/base.py (renamed from freezer_tempest_plugin/tests/freezer/api/base.py)0
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py (renamed from freezer_tempest_plugin/tests/freezer/api/test_backup_compress.py)2
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/test_fs_backup.py (renamed from freezer_tempest_plugin/tests/freezer/api/test_fs_backup.py)2
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py (renamed from freezer_tempest_plugin/tests/freezer/api/test_metadata_checksum.py)2
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/test_swift_backup.py (renamed from freezer_tempest_plugin/tests/freezer/api/test_swift_backup.py)2
-rw-r--r--freezer_tempest_plugin/tests/freezer/agent/test_tests_running.py (renamed from freezer_tempest_plugin/tests/freezer/api/test_tests_running.py)2
-rw-r--r--freezer_tempest_plugin/tests/freezer/scenario/test_backups.py2
9 files changed, 22 insertions, 12 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 581294e..672b4bc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,6 +7,7 @@
7 - freezer-tempest-basic 7 - freezer-tempest-basic
8 - freezer-tempest-client 8 - freezer-tempest-client
9 - freezer-tempest-scheduler 9 - freezer-tempest-scheduler
10 - freezer-tempest-agent
10 11
11 gate: 12 gate:
12 queue: freezer 13 queue: freezer
@@ -14,6 +15,8 @@
14 - freezer-tempest-basic 15 - freezer-tempest-basic
15 - freezer-tempest-client 16 - freezer-tempest-client
16 - freezer-tempest-scheduler 17 - freezer-tempest-scheduler
18 - freezer-tempest-agent
19
17 20
18- job: 21- job:
19 name: freezer-tempest-basic 22 name: freezer-tempest-basic
@@ -22,6 +25,7 @@
22 required-projects: 25 required-projects:
23 - openstack-infra/devstack-gate 26 - openstack-infra/devstack-gate
24 - openstack/python-openstackclient 27 - openstack/python-openstackclient
28 - openstack/swift
25 - openstack/python-freezerclient 29 - openstack/python-freezerclient
26 - openstack/freezer 30 - openstack/freezer
27 - openstack/freezer-api 31 - openstack/freezer-api
@@ -35,16 +39,16 @@
35 tls-proxy: false 39 tls-proxy: false
36 freezer-api: true 40 freezer-api: true
37 tempest: true 41 tempest: true
42 swift: true
38 s-account: false 43 s-account: false
39 s-container: false 44 s-container: false
40 s-object: false 45 s-object: false
41 s-proxy: false 46 s-proxy: false
42 devstack_localrc: 47 devstack_localrc:
43 TEMPEST_PLUGINS: /opt/stack/freezer-tempest-plugin 48 TEMPEST_PLUGINS: '/opt/stack/freezer-tempest-plugin'
44 tempest_test_regex: freezer_tempest_plugin.tests.freezer_api 49 tempest_test_regex: '^(freezer_tempest_plugin.tests.freezer_api.)'
45 tox_envlist: all 50 tox_envlist: 'all'
46 tox_environment: 51 tox_environment:
47 # Do we really need to set this? It's cargo culted
48 PYTHONUNBUFFERED: 'true' 52 PYTHONUNBUFFERED: 'true'
49 zuul_copy_output: 53 zuul_copy_output:
50 /etc/hosts: logs 54 /etc/hosts: logs
@@ -54,12 +58,18 @@
54 parent: freezer-tempest-basic 58 parent: freezer-tempest-basic
55 voting: true 59 voting: true
56 vars: 60 vars:
57 tempest_test_regex: freezer_tempest_plugin.tests.freezerclient 61 tempest_test_regex: '^(freezer_tempest_plugin.tests.freezerclient.)'
58 62
59- job: 63- job:
60 name: freezer-tempest-scheduler 64 name: freezer-tempest-scheduler
61 parent: freezer-tempest-basic 65 parent: freezer-tempest-basic
62 voting: true 66 voting: true
63 vars: 67 vars:
64 tempest_test_regex: freezer_tempest_plugin.tests.scheduler 68 tempest_test_regex: '^(freezer_tempest_plugin.tests.scheduler.)'
65 69
70- job:
71 name: freezer-tempest-agent
72 parent: freezer-tempest-basic
73 voting: true
74 vars:
75 tempest_test_regex: '^(freezer_tempest_plugin.tests.freezer.agent.)'
diff --git a/freezer_tempest_plugin/tests/freezer/api/__init__.py b/freezer_tempest_plugin/tests/freezer/agent/__init__.py
index e69de29..e69de29 100644
--- a/freezer_tempest_plugin/tests/freezer/api/__init__.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/__init__.py
diff --git a/freezer_tempest_plugin/tests/freezer/api/base.py b/freezer_tempest_plugin/tests/freezer/agent/base.py
index fef9637..fef9637 100644
--- a/freezer_tempest_plugin/tests/freezer/api/base.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/base.py
diff --git a/freezer_tempest_plugin/tests/freezer/api/test_backup_compress.py b/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py
index 2a2b910..de8f8eb 100644
--- a/freezer_tempest_plugin/tests/freezer/api/test_backup_compress.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/test_backup_compress.py
@@ -19,7 +19,7 @@ import subprocess
19from tempest.lib import decorators 19from tempest.lib import decorators
20 20
21from freezer_tempest_plugin import common 21from freezer_tempest_plugin import common
22from freezer_tempest_plugin.tests.freezer.api import base 22from freezer_tempest_plugin.tests.freezer.agent import base
23 23
24 24
25class TestFreezerCompressGzip(base.BaseFreezerTest): 25class TestFreezerCompressGzip(base.BaseFreezerTest):
diff --git a/freezer_tempest_plugin/tests/freezer/api/test_fs_backup.py b/freezer_tempest_plugin/tests/freezer/agent/test_fs_backup.py
index 4a5b856..cb432ba 100644
--- a/freezer_tempest_plugin/tests/freezer/api/test_fs_backup.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/test_fs_backup.py
@@ -18,7 +18,7 @@ import shutil
18from oslo_utils import uuidutils 18from oslo_utils import uuidutils
19from tempest.lib import decorators 19from tempest.lib import decorators
20 20
21from freezer_tempest_plugin.tests.freezer.api import base 21from freezer_tempest_plugin.tests.freezer.agent import base
22 22
23 23
24class TestFreezerFSBackup(base.BaseFreezerTest): 24class TestFreezerFSBackup(base.BaseFreezerTest):
diff --git a/freezer_tempest_plugin/tests/freezer/api/test_metadata_checksum.py b/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py
index 4323338..3a5cf2d 100644
--- a/freezer_tempest_plugin/tests/freezer/api/test_metadata_checksum.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/test_metadata_checksum.py
@@ -16,7 +16,7 @@ import subprocess
16from tempest.lib import decorators 16from tempest.lib import decorators
17 17
18from freezer_tempest_plugin import common 18from freezer_tempest_plugin import common
19from freezer_tempest_plugin.tests.freezer.api import base 19from freezer_tempest_plugin.tests.freezer.agent import base
20 20
21 21
22class TestFreezerMetadataChecksum(base.BaseFreezerTest): 22class TestFreezerMetadataChecksum(base.BaseFreezerTest):
diff --git a/freezer_tempest_plugin/tests/freezer/api/test_swift_backup.py b/freezer_tempest_plugin/tests/freezer/agent/test_swift_backup.py
index bd82823..c3073d0 100644
--- a/freezer_tempest_plugin/tests/freezer/api/test_swift_backup.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/test_swift_backup.py
@@ -18,7 +18,7 @@ import shutil
18from oslo_utils import uuidutils 18from oslo_utils import uuidutils
19from tempest.lib import decorators 19from tempest.lib import decorators
20 20
21from freezer_tempest_plugin.tests.freezer.api import base 21from freezer_tempest_plugin.tests.freezer.agent import base
22 22
23 23
24class TestFreezerSwiftBackup(base.BaseFreezerTest): 24class TestFreezerSwiftBackup(base.BaseFreezerTest):
diff --git a/freezer_tempest_plugin/tests/freezer/api/test_tests_running.py b/freezer_tempest_plugin/tests/freezer/agent/test_tests_running.py
index c6f97bd..1119c35 100644
--- a/freezer_tempest_plugin/tests/freezer/api/test_tests_running.py
+++ b/freezer_tempest_plugin/tests/freezer/agent/test_tests_running.py
@@ -14,7 +14,7 @@
14 14
15from tempest.lib import decorators 15from tempest.lib import decorators
16 16
17from freezer_tempest_plugin.tests.freezer.api import base 17from freezer_tempest_plugin.tests.freezer.agent import base
18 18
19 19
20class TestFreezerTestsRunning(base.BaseFreezerTest): 20class TestFreezerTestsRunning(base.BaseFreezerTest):
diff --git a/freezer_tempest_plugin/tests/freezer/scenario/test_backups.py b/freezer_tempest_plugin/tests/freezer/scenario/test_backups.py
index 9344f1c..83a4cdc 100644
--- a/freezer_tempest_plugin/tests/freezer/scenario/test_backups.py
+++ b/freezer_tempest_plugin/tests/freezer/scenario/test_backups.py
@@ -22,7 +22,7 @@ import time
22from tempest.lib.cli import base as cli_base 22from tempest.lib.cli import base as cli_base
23from tempest.lib.cli import output_parser 23from tempest.lib.cli import output_parser
24 24
25from freezer_tempest_plugin.tests.freezer.api import base 25from freezer_tempest_plugin.tests.freezer.agent import base
26 26
27JOB_TABLE_RESULT_COLUMN = 3 27JOB_TABLE_RESULT_COLUMN = 3
28 28