openstack/project-config
Code Issues Proposed changes

Merge "Use local_conf where possible"

Browse Source
This commit is contained in:
Jenkins 2017-07-17 13:19:12 +00:00 committed by Gerrit Code Review
commit ed200bb7d0
6 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
jenkins/jobs/dragonflow.yaml
View File

@ -11,6 +11,11 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -24,11 +29,6 @@
# our project repository. This makes zuul do the right # our project repository. This makes zuul do the right
# reference magic for testing changes. # reference magic for testing changes.
export PROJECTS="openstack/dragonflow $PROJECTS" export PROJECTS="openstack/dragonflow $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True"
# Keep localrc to be able to set some vars in pre_test_hook # Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
@ -55,6 +55,12 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -67,10 +73,6 @@
export PROJECTS="openstack/dragonflow $PROJECTS" export PROJECTS="openstack/dragonflow $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc
function post_test_hook {{ function post_test_hook {{
@ -102,6 +104,16 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
# Add bgp project to fullstack gate job.
enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing
DR_MODE=df-bgp
# Add networking-sfc
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -116,19 +128,8 @@
fi fi
export PROJECTS="openstack/dragonflow $PROJECTS" export PROJECTS="openstack/dragonflow $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow"
# Add bgp project to fullstack gate job.
export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"DR_MODE=df-bgp"
# Add networking-sfc
export PROJECTS="openstack/networking-sfc $PROJECTS" export PROJECTS="openstack/networking-sfc $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True"
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc

19
jenkins/jobs/ec2-api.yaml
View File

@ -11,6 +11,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -21,7 +25,6 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
export PROJECTS="openstack/ec2-api $PROJECTS" export PROJECTS="openstack/ec2-api $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api"
if [ "{network}" = "neutron" ] ; then if [ "{network}" = "neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
@ -52,6 +55,11 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api
RUN_LONG_TESTS=1
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -59,8 +67,6 @@
export PROJECTS="openstack/ec2-api $PROJECTS" export PROJECTS="openstack/ec2-api $PROJECTS"
export PROJECTS="openstack/swift3 $PROJECTS" export PROJECTS="openstack/swift3 $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"RUN_LONG_TESTS=1"
export ENABLED_SERVICES+=,swift3 export ENABLED_SERVICES+=,swift3
function post_test_hook {{ function post_test_hook {{
@ -89,12 +95,15 @@
builders: builders:
- link-logs - link-logs
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PROJECTS="openstack/ec2-api $PROJECTS" export PROJECTS="openstack/ec2-api $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_GATE_VIRT_DRIVER=fake export DEVSTACK_GATE_VIRT_DRIVER=fake
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1

15
jenkins/jobs/freezer.yaml
View File

@ -10,6 +10,15 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
# enable freezer-agent and freezer-scheduler
enable_plugin freezer git://git.openstack.org/openstack/freezer
# enable freezer-api and python-freezerclient
enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
# enable freezer-web-ui and python-freezerclient
enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -24,12 +33,6 @@
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
TEMPEST_REGEX="{name}_tempest_plugin" TEMPEST_REGEX="{name}_tempest_plugin"
export DEVSTACK_GATE_TEMPEST_REGEX=${{TEMPEST_REGEX/\-/\_ }} export DEVSTACK_GATE_TEMPEST_REGEX=${{TEMPEST_REGEX/\-/\_ }}
# enable freezer-agent and freezer-scheduler
export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer https://git.openstack.org/openstack/freezer"
# enable freezer-api and python-freezerclient
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api"
# enable freezer-web-ui and python-freezerclient
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui"
# which repo is being tested # which repo is being tested
export DEVSTACK_PROJECT_FROM_GIT={name} export DEVSTACK_PROJECT_FROM_GIT={name}

10
jenkins/jobs/fuxi.yaml
View File

@ -13,6 +13,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin fuxi git://git.openstack.org/openstack/fuxi
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -25,7 +29,6 @@
export PROJECTS="openstack/fuxi $PROJECTS" export PROJECTS="openstack/fuxi $PROJECTS"
export PROJECTS="openstack/devstack-plugin-container $PROJECTS" export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin fuxi https://git.openstack.org/openstack/fuxi"
# Keep localrc to be able to set some vars in post_test_hook # Keep localrc to be able to set some vars in post_test_hook
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
@ -63,6 +66,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin fuxi git://git.openstack.org/openstack/fuxi
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export DEVSTACK_GATE_USE_PYTHON3=True export DEVSTACK_GATE_USE_PYTHON3=True
@ -76,7 +83,6 @@
export PROJECTS="openstack/fuxi $PROJECTS" export PROJECTS="openstack/fuxi $PROJECTS"
export PROJECTS="openstack/devstack-plugin-container $PROJECTS" export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin fuxi https://git.openstack.org/openstack/fuxi"
# Keep localrc to be able to set some vars in post_test_hook # Keep localrc to be able to set some vars in post_test_hook
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1

5
jenkins/jobs/gce-api.yaml
View File

@ -11,6 +11,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin gce-api git://git.openstack.org/openstack/gce-api
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -21,7 +25,6 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
export PROJECTS="openstack/gce-api $PROJECTS" export PROJECTS="openstack/gce-api $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin gce-api git://git.openstack.org/openstack/gce-api"
if [ "{network}" = "neutron" ] ; then if [ "{network}" = "neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1

32
jenkins/jobs/golang-jobs.yaml
View File

@ -49,6 +49,23 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin {name} git://git.openstack.org/openstack/{name}
# Run a minimum set of services
disable_service horizon
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
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
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -59,25 +76,10 @@
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0
export PROJECTS="openstack/{name} $PROJECTS" export PROJECTS="openstack/{name} $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin {name} git://git.openstack.org/openstack/{name}"
# Keep localrc to be able to set some vars in post_test_hook # Keep localrc to be able to set some vars in post_test_hook
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
# Run a minimum set of services
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"
function pre_test_hook {{ function pre_test_hook {{
if [[ -f "$BASE/new/{name}/contrib/pre_test_hook.sh" ]]; then if [[ -f "$BASE/new/{name}/contrib/pre_test_hook.sh" ]]; then
source $BASE/new/{name}/contrib/pre_test_hook.sh {suite} source $BASE/new/{name}/contrib/pre_test_hook.sh {suite}