Merge "CI: Move test-ovn before test-core-openstack"
This commit is contained in:
commit
7a29abb590
@ -452,6 +452,15 @@
|
|||||||
SCENARIO: "{{ scenario }}"
|
SCENARIO: "{{ scenario }}"
|
||||||
when: openstack_core_tested or scenario in ['ironic', 'magnum', 'scenario_nfv', 'zun', 'octavia']
|
when: openstack_core_tested or scenario in ['ironic', 'magnum', 'scenario_nfv', 'zun', 'octavia']
|
||||||
|
|
||||||
|
- name: Run test-ovn.sh script
|
||||||
|
script:
|
||||||
|
cmd: test-ovn.sh
|
||||||
|
executable: /bin/bash
|
||||||
|
chdir: "{{ kolla_ansible_src_dir }}"
|
||||||
|
when: scenario == "ovn"
|
||||||
|
environment:
|
||||||
|
CONTAINER_ENGINE: "{{ container_engine }}"
|
||||||
|
|
||||||
- name: Run test-core-openstack.sh script
|
- name: Run test-core-openstack.sh script
|
||||||
script:
|
script:
|
||||||
cmd: test-core-openstack.sh
|
cmd: test-core-openstack.sh
|
||||||
@ -538,15 +547,6 @@
|
|||||||
environment:
|
environment:
|
||||||
CONTAINER_ENGINE: "{{ container_engine }}"
|
CONTAINER_ENGINE: "{{ container_engine }}"
|
||||||
|
|
||||||
- name: Run test-ovn.sh script
|
|
||||||
script:
|
|
||||||
cmd: test-ovn.sh
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: "{{ kolla_ansible_src_dir }}"
|
|
||||||
when: scenario == "ovn"
|
|
||||||
environment:
|
|
||||||
CONTAINER_ENGINE: "{{ container_engine }}"
|
|
||||||
|
|
||||||
- name: Run test-mariadb.sh script
|
- name: Run test-mariadb.sh script
|
||||||
script:
|
script:
|
||||||
cmd: test-mariadb.sh
|
cmd: test-mariadb.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user