Drop legacy dsvm job & change zuulv3 integration job
The legacy job in this repository was just setting up devstack with manila-ui enabled and doing nothing else. We added an integration gate job a couple of releases ago that does exactly what the above job does, and goes a step beyond by executing tests that check whether manila-ui is working. We can make this job use the fake driver from manila so we can add more interesting and useful test cases without having to worry about any lacking capabilities. Also make this integration job voting. Change-Id: Ibf35d7196d83e1018881776110ce173e68cf8286 Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com> (cherry picked from commit1f0754ff32
) (cherry picked from commitc29dd15b4d
) (cherry picked from commit209943752a
)
This commit is contained in:
parent
cc52163a36
commit
8e62f28386
66
.zuul.yaml
66
.zuul.yaml
|
@ -9,8 +9,6 @@
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- manila-ui-dsvm:
|
|
||||||
voting: false
|
|
||||||
- manila-ui-integration-tests:
|
- manila-ui-integration-tests:
|
||||||
voting: false
|
voting: false
|
||||||
- horizon-openstack-tox-python3-django111
|
- horizon-openstack-tox-python3-django111
|
||||||
|
@ -18,23 +16,11 @@
|
||||||
- horizon-openstack-tox-py27dj110
|
- horizon-openstack-tox-py27dj110
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
|
- manila-ui-integration-tests
|
||||||
- horizon-openstack-tox-python3-django111
|
- horizon-openstack-tox-python3-django111
|
||||||
- horizon-openstack-tox-py27dj19
|
- horizon-openstack-tox-py27dj19
|
||||||
- horizon-openstack-tox-py27dj110
|
- horizon-openstack-tox-py27dj110
|
||||||
|
|
||||||
- job:
|
|
||||||
name: manila-ui-dsvm
|
|
||||||
parent: legacy-dsvm-base
|
|
||||||
run: playbooks/legacy/manila-ui-dsvm/run.yaml
|
|
||||||
post-run: playbooks/legacy/manila-ui-dsvm/post.yaml
|
|
||||||
timeout: 6000
|
|
||||||
required-projects:
|
|
||||||
- openstack/devstack-gate
|
|
||||||
- openstack/manila
|
|
||||||
- openstack/manila-ui
|
|
||||||
- openstack/python-manilaclient
|
|
||||||
- openstack/manila-tempest-plugin
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: manila-ui-integration-tests
|
name: manila-ui-integration-tests
|
||||||
parent: horizon-integration-tests
|
parent: horizon-integration-tests
|
||||||
|
@ -45,17 +31,63 @@
|
||||||
- name: openstack/manila-ui
|
- name: openstack/manila-ui
|
||||||
- name: openstack/manila-tempest-plugin
|
- name: openstack/manila-tempest-plugin
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/devstack
|
- zuul: openstack/devstack
|
||||||
- zuul: openstack/horizon
|
- zuul: openstack/horizon
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
vars:
|
vars:
|
||||||
|
devstack_localrc:
|
||||||
|
USE_PYTHON3: true
|
||||||
|
# Enable manila with a fake driver that supports all capabilities
|
||||||
|
MANILA_CONFIGURE_DEFAULT_TYPES: true
|
||||||
|
MANILA_OPTGROUP_DEFAULT_quota_share_networks: 50
|
||||||
|
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
|
||||||
|
MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
|
||||||
|
MANILA_SERVICE_IMAGE_ENABLED: false
|
||||||
|
MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL: 1
|
||||||
|
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
|
||||||
|
MANILA_REPLICA_STATE_UPDATE_INTERVAL: 10
|
||||||
|
MANILA_ENABLED_BACKENDS: alpha,beta,gamma,delta
|
||||||
|
MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,delta,membernet,adminnet
|
||||||
|
MANILA_OPTGROUP_alpha_share_driver: manila.tests.share.drivers.dummy.DummyDriver
|
||||||
|
MANILA_OPTGROUP_alpha_driver_handles_share_servers: true
|
||||||
|
MANILA_OPTGROUP_alpha_share_backend_name: ALPHA
|
||||||
|
MANILA_OPTGROUP_alpha_network_config_group: membernet
|
||||||
|
MANILA_OPTGROUP_alpha_admin_network_config_group: adminnet
|
||||||
|
MANILA_OPTGROUP_alpha_replication_domain: DUMMY_DOMAIN_2
|
||||||
|
MANILA_OPTGROUP_beta_share_driver: manila.tests.share.drivers.dummy.DummyDriver
|
||||||
|
MANILA_OPTGROUP_beta_driver_handles_share_servers: true
|
||||||
|
MANILA_OPTGROUP_beta_share_backend_name: BETA
|
||||||
|
MANILA_OPTGROUP_beta_network_config_group: membernet
|
||||||
|
MANILA_OPTGROUP_beta_admin_network_config_group: adminnet
|
||||||
|
MANILA_OPTGROUP_beta_replication_domain: DUMMY_DOMAIN_2
|
||||||
|
MANILA_OPTGROUP_gamma_share_driver: manila.tests.share.drivers.dummy.DummyDriver
|
||||||
|
MANILA_OPTGROUP_gamma_driver_handles_share_servers: false
|
||||||
|
MANILA_OPTGROUP_gamma_share_backend_name: GAMMA
|
||||||
|
MANILA_OPTGROUP_gamma_replication_domain: DUMMY_DOMAIN
|
||||||
|
MANILA_OPTGROUP_delta_share_driver: manila.tests.share.drivers.dummy.DummyDriver
|
||||||
|
MANILA_OPTGROUP_delta_driver_handles_share_servers: false
|
||||||
|
MANILA_OPTGROUP_delta_share_backend_name: DELTA
|
||||||
|
MANILA_OPTGROUP_delta_replication_domain: DUMMY_DOMAIN
|
||||||
|
MANILA_OPTGROUP_membernet_network_api_class: manila.network.standalone_network_plugin.StandaloneNetworkPlugin
|
||||||
|
MANILA_OPTGROUP_membernet_standalone_network_plugin_gateway: 10.0.0.1
|
||||||
|
MANILA_OPTGROUP_membernet_standalone_network_plugin_mask: 24
|
||||||
|
MANILA_OPTGROUP_membernet_standalone_network_plugin_network_type: vlan
|
||||||
|
MANILA_OPTGROUP_membernet_standalone_network_plugin_segmentation_id: 1010
|
||||||
|
MANILA_OPTGROUP_membernet_standalone_network_plugin_allowed_ip_ranges: 10.0.0.10-10.0.0.209
|
||||||
|
MANILA_OPTGROUP_membernet_network_plugin_ipv4_enabled: true
|
||||||
|
MANILA_OPTGROUP_adminnet_network_api_class: manila.network.standalone_network_plugin.StandaloneNetworkPlugin
|
||||||
|
MANILA_OPTGROUP_adminnet_standalone_network_plugin_gateway: 11.0.0.1
|
||||||
|
MANILA_OPTGROUP_adminnet_standalone_network_plugin_mask: 24
|
||||||
|
MANILA_OPTGROUP_adminnet_standalone_network_plugin_network_type: vlan
|
||||||
|
MANILA_OPTGROUP_adminnet_standalone_network_plugin_segmentation_id: 1011
|
||||||
|
MANILA_OPTGROUP_adminnet_standalone_network_plugin_allowed_ip_ranges: 11.0.0.10-11.0.0.19,11.0.0.30-11.0.0.39,11.0.0.50-11.0.0.199
|
||||||
|
MANILA_OPTGROUP_adminnet_network_plugin_ipv4_enabled: true
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
manila: https://opendev.org/openstack/manila
|
manila: https://opendev.org/openstack/manila
|
||||||
manila-ui: https://opendev.org/openstack/manila-ui
|
manila-ui: https://opendev.org/openstack/manila-ui
|
||||||
devstack_services:
|
devstack_services:
|
||||||
horizon: true
|
horizon: true
|
||||||
tox_envlist: integration
|
tox_envlist: integration
|
||||||
|
|
||||||
|
|
|
@ -1,80 +0,0 @@
|
||||||
- hosts: primary
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=**/*nose_results.html
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=**/*testr_results.html.gz
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=/.testrepository/tmp*
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=**/*testrepository.subunit.gz
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}/tox'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=/.tox/*/log/*
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=/logs/**
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
|
@ -1,84 +0,0 @@
|
||||||
- hosts: all
|
|
||||||
name: Autoconverted job legacy-manila-ui-dsvm from old job gate-manila-ui-dsvm-nv
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Ensure legacy workspace directory
|
|
||||||
file:
|
|
||||||
path: '{{ ansible_user_dir }}/workspace'
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
cat > clonemap.yaml << EOF
|
|
||||||
clonemap:
|
|
||||||
- name: openstack/devstack-gate
|
|
||||||
dest: devstack-gate
|
|
||||||
EOF
|
|
||||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
|
||||||
https://opendev.org \
|
|
||||||
openstack/devstack-gate
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
|
||||||
[[local|localrc]]
|
|
||||||
enable_plugin manila https://opendev.org/openstack/manila
|
|
||||||
enable_plugin manila-ui https://opendev.org/openstack/manila-ui
|
|
||||||
|
|
||||||
EOF
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y firefox dbus
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y xvfb
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=0
|
|
||||||
export DEVSTACK_GATE_HORIZON=1
|
|
||||||
export DEVSTACK_GATE_EXERCISES=0
|
|
||||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
||||||
export DEVSTACK_GATE_NEUTRON=1
|
|
||||||
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
|
|
||||||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
|
||||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
|
||||||
export PYTHON3_VERSION="3.6"
|
|
||||||
|
|
||||||
# Keep localrc to be able to set some vars in pre_test_hook
|
|
||||||
export KEEP_LOCALRC=1
|
|
||||||
# Enable dummy driver in Manila
|
|
||||||
function pre_test_hook {
|
|
||||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
|
|
||||||
True \
|
|
||||||
dummy \
|
|
||||||
multibackend
|
|
||||||
}
|
|
||||||
export -f pre_test_hook
|
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
Loading…
Reference in New Issue