Browse Source

Zuulv3 native grenade job

The existing "manila-grenade" job relies on
devstack-gate, a deprecated project. The Grenade
project now has a native zuulv3 style job that
we can inherit and run manila's upgrade tests.

Manila's grenade tests are only going to run
API tests, and hence this grenade job doesn't
have to enable nova, cinder, glance, neutron
and swift. However, bug #1887835 prevents
us from disabling nova at the moment,
and nova requires glance, placement and neutron
to be deployed, so we'll be enabling these
services too until that bug is addressed.

Change-Id: I1636c612ac2475f7a00c0888ef62daa6c516eef2
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
(cherry picked from commit 660355eb86)
changes/64/743864/1
Goutham Pacha Ravi 2 weeks ago
parent
commit
6815add996
5 changed files with 93 additions and 109 deletions
  1. +2
    -14
      devstack/upgrade/settings
  2. +0
    -15
      playbooks/legacy/grenade-dsvm-manila/post.yaml
  3. +0
    -67
      playbooks/legacy/grenade-dsvm-manila/run.yaml
  4. +91
    -0
      zuul.d/grenade-jobs.yaml
  5. +0
    -13
      zuul.d/project.yaml

+ 2
- 14
devstack/upgrade/settings View File

@@ -5,22 +5,10 @@ register_db_to_save manila

export BASE_RUN_SMOKE=False
export TARGET_RUN_SMOKE=False
export ENABLE_TEMPEST=False
export PYTHON3_VERSION=${PYTHON3_VERSION}


devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
devstack_localrc base enable_plugin manila https://opendev.org/openstack/manila stable/train
devstack_localrc base MANILA_UI_ENABLED=False
devstack_localrc base OSLO_SERVICE_WORKS=True

# NOTE(vponomaryov): stable client is used for keeping scenarios stable
# so they are not broken by changed CLI view.
# so they are not broken by changed CLI views.
devstack_localrc base MANILACLIENT_BRANCH="stable/train"
devstack_localrc target MANILACLIENT_BRANCH="stable/train"

devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
devstack_localrc target enable_plugin manila https://opendev.org/openstack/manila
devstack_localrc target MANILA_UI_ENABLED=False
devstack_localrc target OSLO_SERVICE_WORKS=True
devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
devstack_localrc target MANILACLIENT_BRANCH="stable/train"

+ 0
- 15
playbooks/legacy/grenade-dsvm-manila/post.yaml View File

@@ -1,15 +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=/logs/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

+ 0
- 67
playbooks/legacy/grenade-dsvm-manila/run.yaml View File

@@ -1,67 +0,0 @@
- hosts: all
name: Autoconverted job legacy-grenade-dsvm-manila from old job gate-grenade-dsvm-manila-ubuntu-xenial-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
export PROJECTS="openstack/grenade $PROJECTS"
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=0
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_GRENADE=pullup

export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False

# Basic services needed for grenade manila job using dummy driver
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit

export DEVSTACK_GATE_USE_PYTHON3=True

# Enable manila grenade plugin. Provided repo should be
# cloned by zuul before devstack run and below provided
# link should not be used.
export GRENADE_PLUGINRC="enable_grenade_plugin manila https://opendev.org/openstack/manila"

# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

function pre_test_hook {
source $BASE/new/manila/contrib/ci/pre_test_hook.sh False lvm multibackend
}
export -f pre_test_hook

export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi

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 }}'

+ 91
- 0
zuul.d/grenade-jobs.yaml View File

@@ -0,0 +1,91 @@
- job:
name: manila-grenade
parent: grenade
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^manila/hacking/.*$
- ^manila/tests/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
- ^tox.ini$
required-projects:
- openstack/grenade
- openstack/manila
- openstack/python-manilaclient
- openstack/manila-tempest-plugin
vars:
grenade_devstack_localrc:
shared:
# This job performs data path tests, it's good to test
# both DHSS driver modes with it, but for now, it'll use the LVM
# driver (DHSS=False)
MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST: true
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_CONFIGURE_DEFAULT_TYPES: true
SHARE_DRIVER: manila.share.drivers.lvm.LVMShareDriver
MANILA_ENABLED_BACKENDS: london,paris
MANILA_BACKEND1_CONFIG_GROUP_NAME: london
MANILA_BACKEND2_CONFIG_GROUP_NAME: paris
MANILA_SHARE_BACKEND1_NAME: LONDON
MANILA_SHARE_BACKEND2_NAME: PARIS
MANILA_OPTGROUP_london_driver_handles_share_servers: false
MANILA_OPTGROUP_paris_driver_handles_share_servers: false
SHARE_BACKING_FILE_SIZE: 32000M
devstack_plugins:
manila: https://opendev.org/openstack/manila.git
devstack_services:
manila: true
m-api: true
m-sch: true
m-shr: true
m-dat: true
# don't need some services
c-api: false
c-bak: false
c-vol: false
cinder: false
# These services can be turned off, if not
# for: https://launchpad.net/bugs/1887835
# g-api: false
# g-reg: false
# n-api: false
# n-api-meta: false
# n-cauth: false
# n-cond: false
# n-cpu: false
# n-novnc: false
# n-obj: false
# n-sch: false
# placement-api: false
# q-agt: false
# q-dhcp: false
# q-l3: false
# q-meta: false
# q-metering: false
# q-svc: false
s-account: false
s-container: false
s-object: false
s-proxy: false
devstack_local_conf:
test-config:
"$TEMPEST_CONFIG":
share:
default_share_type_name: default
run_mount_snapshot_tests: true
run_shrink_tests: false
run_revert_to_snapshot_tests: true
enable_user_rules_for_protocols: cifs
enable_ip_rules_for_protocols: nfs
multitenancy_enabled: False
backend_names: LONDON,PARIS
multi_backend: true
tempest_plugins:
- manila-tempest-plugin
tempest_test_regex: ^manila_tempest_tests.tests.api
tox_envlist: all

.zuul.yaml → zuul.d/project.yaml View File

@@ -73,19 +73,6 @@
- ^tools/.*$
- ^tox.ini$

- job:
name: manila-grenade
parent: manila-tempest-base
run: playbooks/legacy/grenade-dsvm-manila/run.yaml
post-run: playbooks/legacy/grenade-dsvm-manila/post.yaml
timeout: 10800
required-projects:
- openstack/grenade
- openstack/devstack-gate
- openstack/manila
- openstack/python-manilaclient
- openstack/manila-tempest-plugin

- job:
name: manila-tempest-dsvm-container-scenario-custom-image
parent: manila-tempest-base

Loading…
Cancel
Save