From fe431088db1125cccc0055d05f4ab7cc85a314a0 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 7 Apr 2017 12:06:31 -0400 Subject: [PATCH] Experimental py35 dsvm for ceph devstack plugin Change-Id: I15b7fdfda046dcf72bd22bbb53fb452a5cdf934b --- jenkins/jobs/devstack-gate.yaml | 45 ++++++++++++++++++ jenkins/jobs/manila.yaml | 81 +++++++++++++++++++++++++++++++++ jenkins/jobs/projects.yaml | 14 ++++++ zuul/layout.yaml | 18 +++++++- 4 files changed, 157 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 722635133b..98e689751c 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -1946,6 +1946,51 @@ - devstack-logs - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-py35-full-devstack-plugin-ceph-{node}{suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 180 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - local_conf: + conf: | + [[local|localrc]] + # swift is not ready for python3 yet + disable_service s-account + disable_service s-container + disable_service s-object + disable_service s-proxy + + enable_plugin devstack-plugin-{plugin} git://git.openstack.org/{plugin-repo} + + - shell: | + #!/bin/bash -xe + export DEVSTACK_GATE_USE_PYTHON3=True + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export PROJECTS="{plugin-repo} $PROJECTS" + + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-ceph-rc + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log - job-template: name: '{pipeline}-tempest-dsvm-full-ceph-plugin-src-{name}-{node}{suffix}' diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index 42f1e3a990..5fe1241817 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -558,3 +558,84 @@ publishers: - devstack-logs - console-log + + +- job-template: + name: 'gate-manila-tempest-minimal-py35-dsvm-cephfs-{variant}-{node}{suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 80 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - local_conf: + conf: | + [[local|localrc]] + + # swift is not ready for python3 yet + disable_service s-account + disable_service s-container + disable_service s-object + disable_service s-proxy + + enable_plugin manila git://git.openstack.org/openstack/manila + + enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph + + # Enable CephFS as the backend for Manila. + ENABLE_CEPH_MANILA=True + + # Disable Ceph as the storage backend for Nova. + ENABLE_CEPH_NOVA=False + + # Disable Ceph as the storage backend for Glance. + ENABLE_CEPH_GLANCE=False + + # Disable Ceph as the storage backend for Cinder. + ENABLE_CEPH_CINDER=False + + # Disable Ceph as the storage backend for Cinder backup. + ENABLE_CEPH_C_BAK=False + + # Set native or NFS variant of ceph driver + MANILA_CEPH_DRIVER=cephfs{variant} + + - shell: | + #!/bin/bash -xe + export DEVSTACK_GATE_USE_PYTHON3=True + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_NEUTRON=1 + export ENABLED_SERVICES=tempest + export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS" + export KEEP_LOCALRC=1 + + function pre_test_hook {{ + # Configure Manila with a CephFS Native or NFS driver backend. + # Refer job-template's pre_test_hook for more details on the + # arguments. + source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ + false cephfs{variant} singlebackend + }} + export -f pre_test_hook + + function post_test_hook {{ + # Configure and run Tempest API tests on Manila with a + # CephFSNative driver backend. + # Refer job-template's post_test_hook for more details on the + # arguments. + source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ + singlebackend cephfs{variant} api + }} + export -f post_test_hook + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index dcc4f79d4b..e986fd894a 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -3926,6 +3926,13 @@ plugin-repo: openstack/devstack-plugin-ceph suffix: '' branch-override: default + - '{pipeline}-tempest-dsvm-py35-full-devstack-plugin-ceph-{node}{suffix}': + node: ubuntu-xenial + pipeline: gate + plugin: ceph + plugin-repo: openstack/devstack-plugin-ceph + suffix: '-nv' + branch-override: default - project: name: devstack-plugin-container @@ -6985,6 +6992,13 @@ variant: - 'native' - 'nfs' + - 'gate-manila-tempest-minimal-py35-dsvm-cephfs-{variant}-{node}{suffix}': + node: centos-7 + suffix: '-nv' + variant: + - 'native' + - 'nfs' + - project: name: manila-image-elements diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1668856ce8..583496f12f 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2661,6 +2661,11 @@ jobs: - name: ^gate-rally-dsvm-cinder-ubuntu-xenial.*$ branch: ^(?!(stable/mitaka|driverfixes/)).*$ + # NOTE(tbarron): Ensure this job is stable in master (Pike) before + # making it vote. Python 3.x job tests only from Pike forwards. + - name: ^gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial.*$ + branch: ^(?!(stable/(newton|ocata)|driverfixes/)).*$ + # NOTE(jordanP): Non-voting is temporary until the job stabilizes in # master (Pike). - name: ^gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial.*$ @@ -3840,6 +3845,9 @@ projects: - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial experimental: - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv + - gate-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7-nv + - gate-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7-nv - gate-neutron-dsvm-functional-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-ubuntu-trusty - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial @@ -6853,6 +6861,7 @@ projects: - gate-grenade-dsvm-cinder-mn-sub-volschbak-ubuntu-xenial-nv - gate-grenade-dsvm-cinder-mn-sub-bak-ubuntu-xenial-nv - gate-rally-dsvm-py35-cinder-nv + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv - name: openstack/cinder-fusioncompute template: @@ -8976,6 +8985,10 @@ projects: - gate-manila-tempest-minimal-dsvm-cephfs-nfs-centos-7-nv gate: - gate-devstack-plugin-ceph-bashate + experimental: + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv + - gate-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7-nv + - gate-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7-nv - name: openstack/devstack-plugin-container template: @@ -10504,6 +10517,7 @@ projects: experimental: - gate-grenade-dsvm-forward-ubuntu-trusty - gate-glance-dsvm-grenade-multinode-ubuntu-xenial-nv + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv - name: openstack/glance-specs template: @@ -13372,7 +13386,7 @@ projects: - gate-tempest-dsvm-full-devstack-plugin-nfs-nv - gate-tripleo-ci-centos-7-nonha-multinode-oooq - gate-barbican-simple-crypto-dsvm-tempest-nova-ubuntu-xenial-nv - + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv - name: openstack/nova-dpm template: @@ -18425,6 +18439,8 @@ projects: - gate-tempest-dsvm-nova-v20-api-ubuntu-xenial - gate-tempest-dsvm-lvm-multibackend-ubuntu-xenial-nv - gate-tempest-dsvm-cinder-v1-ubuntu-xenial + - gate-tempest-dsvm-py35-full-devstack-plugin-ceph-ubuntu-xenial-nv + post: - tempest-docs-ubuntu-xenial - tempest-coverage-ubuntu-xenial