From 547e1664a73bac67fe42676d34b34281b4a70d7e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 18 Jan 2017 16:43:23 -0600 Subject: [PATCH] Add a shade job to test old openstack with latest libs Also, fix the job that tests with latest libs on current openstack by having it actually install into the functional-tips virtualenv. Finally, add both of these jobs to os-client-config. Change-Id: Ic841070d572d6363e960b9fef092e1a7ee30f752 --- jenkins/jobs/projects.yaml | 5 +++ jenkins/jobs/shade.yaml | 69 +++++++++++++++++++++++++++++++++++--- zuul/layout.yaml | 4 +++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 5efbb315c6..15f509b7e8 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -13220,6 +13220,11 @@ node: ubuntu-xenial suffix: '' branch-override: stable/newton + - '{pipeline}-shade-dsvm-functional-legacy-libs{suffix}': + pipeline: gate + node: ubuntu-xenial + suffix: '-nv' + branch-override: stable/newton - '{pipeline}-shade-dsvm-functional-libs{suffix}': pipeline: gate node: ubuntu-xenial diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml index bf5ae82dd8..5f9ec7d454 100644 --- a/jenkins/jobs/shade.yaml +++ b/jenkins/jobs/shade.yaml @@ -54,6 +54,70 @@ - devstack-logs - console-log +- job-template: + name: '{pipeline}-shade-dsvm-functional-legacy-libs{suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 70 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export SHADE_USE_KEYSTONE_V2=1 + export SHADE_HAS_DESIGNATE=1 + export SHADE_HAS_HEAT=1 + export SHADE_HAS_MAGNUM=0 + export SHADE_HAS_NEUTRON=0 + export SHADE_HAS_SWIFT=1 + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_NEUTRON=0 + export DEVSTACK_GATE_HEAT=1 + export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=True" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin designate git://git.openstack.org/openstack/designate" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" + export PROJECTS="openstack/designate $PROJECTS" + export PROJECTS="openstack/designate-dashboard $PROJECTS" + export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" + export PROJECTS="openstack-infra/shade $PROJECTS" + export PROJECTS="openstack/os-client-config $PROJECTS" + export PROJECTS="openstack/keystoneauth $PROJECTS" + export PROJECTS="openstack/python-novaclient $PROJECTS" + export PROJECTS="openstack/python-keystoneclient $PROJECTS" + export PROJECTS="openstack/python-cinderclient $PROJECTS" + export PROJECTS="openstack/python-neutronclient $PROJECTS" + export PROJECTS="openstack/python-heatclient $PROJECTS" + export PROJECTS="openstack/python-designateclient $PROJECTS" + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + function post_test_hook {{ + $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh tips + }} + 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 + - job-template: name: '{pipeline}-shade-dsvm-functional-neutron{suffix}' node: '{node}' @@ -204,19 +268,16 @@ export PROJECTS="openstack/python-keystoneclient $PROJECTS" export PROJECTS="openstack/python-cinderclient $PROJECTS" export PROJECTS="openstack/python-neutronclient $PROJECTS" - export PROJECTS="openstack/python-swiftclient $PROJECTS" export PROJECTS="openstack/python-heatclient $PROJECTS" export PROJECTS="openstack/python-designateclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=os-client-config,keystoneauth,python-novaclient,python-keystoneclient,python-cinderclient,python-neutronclient,python-swiftclient,python-heatclient,python-designateclient" - export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi function post_test_hook {{ - $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh + $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh tips }} export -f post_test_hook diff --git a/zuul/layout.yaml b/zuul/layout.yaml index dff9933457..08b423fc33 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4884,6 +4884,7 @@ projects: check: - shade-coverage-ubuntu-xenial - gate-shade-dsvm-functional-legacy + - gate-shade-dsvm-functional-legacy-libs-nv - gate-shade-dsvm-functional-libs-nv - gate-shade-dsvm-functional-magnum-nv - gate-shade-dsvm-functional-neutron @@ -13640,6 +13641,9 @@ projects: - name: pypy-jobs - name: lib-forward-testing - name: release-notes-jobs + check: + - gate-shade-dsvm-functional-legacy-libs-nv + - gate-shade-dsvm-functional-libs-nv - name: openstack/os-cloud-config template: