openstack/project-config
Code Issues Proposed changes

Migrate shade tests to local_conf

Browse Source 
We're using the old syntax. Use the new syntax. It's the same for most
of the jobs, so define a builder.

While we're at it, sort some of the lists of things and switch from
cloning over git:// to https://

Change-Id: Id91e308514154e4a6f00b9d6fe50cab60dffa0e7
This commit is contained in:
Monty Taylor 2017-05-20 07:49:22 -05:00
parent eb2ed55b96
commit 86d03cd17e
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
jenkins/jobs/shade.yaml
View File

@ -1,3 +1,19 @@
- builder:
name: shade-local-conf
builders:
- local_conf:
conf: |
[[local|localrc]]
enable_plugin heat https://git.openstack.org/openstack/heat
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
disable_service horizon
- job-template: - job-template:
name: '{pipeline}-shade-dsvm-functional-legacy{suffix}' name: '{pipeline}-shade-dsvm-functional-legacy{suffix}'
node: '{node}' node: '{node}'
@ -11,28 +27,33 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
ENABLE_IDENTITY_V2=True
enable_plugin heat https://git.openstack.org/openstack/heat
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
disable_service horizon
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=0
export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=0 export SHADE_HAS_NEUTRON=0
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
export PYTHONUNBUFFERED=true export SHADE_USE_KEYSTONE_V2=1
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 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-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -63,32 +84,37 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
ENABLE_IDENTITY_V2=True
enable_plugin heat https://git.openstack.org/openstack/heat
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
disable_service horizon
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=0
export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=0 export SHADE_HAS_NEUTRON=0
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
export PYTHONUNBUFFERED=true export SHADE_USE_KEYSTONE_V2=1
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 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-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/keystoneauth $PROJECTS" export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS" export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS" export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
# The purpose of this job is to test that latest libs work with # The purpose of this job is to test that latest libs work with
# newton devstack. We don't want to install devstack from branch # newton devstack. We don't want to install devstack from branch
# tips. We want to install branch tips (of master) into our # tips. We want to install branch tips (of master) into our
@ -127,8 +153,11 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- shade-local-conf
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
@ -138,17 +167,7 @@
if [ "{python}" == "-py35" ]; then if [ "{python}" == "-py35" ]; then
export SHADE_TOX_PYTHON=python3 export SHADE_TOX_PYTHON=python3
fi fi
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1
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-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
@ -182,6 +201,24 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin magnum https://git.openstack.org/openstack/magnum
MAGNUM_GUEST_IMAGE_URL=https://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2
MAGNUM_IMAGE_NAME=fedora-atomic-f23-dib
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
disable_service horizon
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -191,25 +228,10 @@
export SHADE_HAS_NEUTRON=1 export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=0 export SHADE_HAS_SWIFT=0
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
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-infra/shade $PROJECTS"
export PROJECTS="openstack/magnum $PROJECTS" export PROJECTS="openstack/magnum $PROJECTS"
export PROJECTS="openstack/python-magnumclient $PROJECTS" export PROJECTS="openstack/python-magnumclient $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -241,8 +263,11 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- shade-local-conf
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
@ -252,14 +277,12 @@
if [ "{python}" == "-py35" ]; then if [ "{python}" == "-py35" ]; then
export SHADE_TOX_PYTHON=python3 export SHADE_TOX_PYTHON=python3
fi fi
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export PROJECTS="openstack-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/keystoneauth $PROJECTS" export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS" export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS" export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -291,26 +314,20 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- shade-local-conf
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1 export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1
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-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -340,26 +357,19 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- shade-local-conf
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export PYTHONUNBUFFERED=true
export SHADE_ANSIBLE_DEV=1 export SHADE_ANSIBLE_DEV=1
export SHADE_HAS_DESIGNATE=0 export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1 export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1 export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1
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-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}