diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 56ab7583b7..cb5948bbb7 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -12,8 +12,6 @@ check: jobs: - horizon-selenium-headless - - horizon-integration-tests: - voting: false - horizon-integration-pytest - horizon-ui-pytest: voting: false @@ -24,13 +22,14 @@ jobs: - horizon-dsvm-tempest-plugin - horizon-selenium-headless + - horizon-integration-pytest - horizon-tempest-plugin-ipv6 experimental: jobs: - - horizon-integration-tests-xstatic-master + - horizon-integration-pytest-xstatic-master - horizon-tox-py36-xstatic-master - horizon-nodejs20-run-test-xstatic-master periodic: jobs: - horizon-nodejs20-run-test - - horizon-integration-tests + - horizon-integration-pytest diff --git a/.zuul.d/tempest-and-integrated.yaml b/.zuul.d/tempest-and-integrated.yaml index 1b447e54c1..5f30a3e06b 100644 --- a/.zuul.d/tempest-and-integrated.yaml +++ b/.zuul.d/tempest-and-integrated.yaml @@ -1,35 +1,3 @@ -- job: - name: horizon-integration-tests - parent: devstack - nodeset: devstack-single-node-debian-bookworm - pre-run: playbooks/horizon-devstack-integration/pre.yaml - run: playbooks/horizon-devstack-integration/run.yaml - post-run: playbooks/horizon-devstack-integration/post.yaml - roles: - - zuul: openstack-infra/devstack - required-projects: - - openstack/horizon - - openstack/requirements - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - ^.*/locale/.*$ - # Unit tests are not related to the integration tests - - ^horizon/test/unit/.*$ - - ^openstack_auth/tests/unit/.*$ - - ^openstack_dashboard/test/unit/.*$ - - ^openstack_dashboard/contrib/.*/tests.py$ - - ^openstack_dashboard/dashboards/.*/tests.py$ - # JavaScript unit tests are not related to the integration tests - - ^openstack_dashboard/.*/[^/]*\.spec\.js$ - - ^horizon/static/.*/[^/]*\.spec\.js$ - vars: - devstack_services: - horizon: true - tox_envlist: integration - tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" - - job: name: horizon-integration-pytest parent: devstack diff --git a/.zuul.d/xstatic-master.yaml b/.zuul.d/xstatic-master.yaml index def16d83b9..8a9fbec321 100644 --- a/.zuul.d/xstatic-master.yaml +++ b/.zuul.d/xstatic-master.yaml @@ -1,6 +1,6 @@ - job: - name: horizon-integration-tests-xstatic-master - parent: horizon-integration-tests + name: horizon-integration-pytest-xstatic-master + parent: horizon-integration-pytest required-projects: &xstatic-projects - openstack/horizon - openstack/xstatic-angular