Kilo spring cleaning
Clean up what we can of old kilo branch stuff. This doesn't remove everything as some projects do still have kilo branches floating around. Change-Id: I5aff7649829685a6dc1eb96f398d16e46670a967
This commit is contained in:
parent
6e52add08c
commit
bb2abf1f53
@ -2015,7 +2015,6 @@ openstack-qa:
|
|||||||
- master
|
- master
|
||||||
- stable/mitaka
|
- stable/mitaka
|
||||||
- stable/liberty
|
- stable/liberty
|
||||||
- stable/kilo
|
|
||||||
|
|
||||||
openstack-quota:
|
openstack-quota:
|
||||||
events:
|
events:
|
||||||
|
@ -2010,12 +2010,7 @@
|
|||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
export DEVSTACK_GATE_TEMPEST=1
|
||||||
export DEVSTACK_GATE_TEMPEST_REGEX="database"
|
export DEVSTACK_GATE_TEMPEST_REGEX="database"
|
||||||
if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
|
||||||
# Trove was moved out of DevStack as plugin after Kilo
|
|
||||||
export DEVSTACK_GATE_TROVE=1
|
|
||||||
else
|
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# use tempest plugin (copied from ironic.yaml)
|
# use tempest plugin (copied from ironic.yaml)
|
||||||
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
|
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
|
||||||
|
@ -67,30 +67,23 @@
|
|||||||
- ironic-extra-vars:
|
- ironic-extra-vars:
|
||||||
script: |
|
script: |
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
|
||||||
# Support for non-CoreOS IPA ramdisks was added in Mitaka
|
# Standardize VM size for each supported ramdisk
|
||||||
if [ "$ZUUL_BRANCH" != "stable/liberty" ] ; then
|
case "{ramdisk-type}" in
|
||||||
# Standardize VM size for each supported ramdisk
|
'tinyipa')
|
||||||
case "{ramdisk-type}" in
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
|
||||||
'tinyipa')
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
|
;;
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
'tinyipa256')
|
||||||
;;
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
|
||||||
'tinyipa256')
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
|
;;
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
'coreos')
|
||||||
;;
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
|
||||||
'coreos')
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
|
;;
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
|
# if using a ramdisk without a known good value, use the devstack
|
||||||
;;
|
# default by not exporting any value for IRONIC_VM_SPECS_RAM
|
||||||
# if using a ramdisk without a known good value, use the devstack
|
esac
|
||||||
# default by not exporting any value for IRONIC_VM_SPECS_RAM
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
# For kilo and liberty, we still need 1280mb of ram as
|
|
||||||
# we only have the CoreOS ramdisk.
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- builder:
|
- builder:
|
||||||
name: ironic-ipxe-disabled
|
name: ironic-ipxe-disabled
|
||||||
|
@ -24,10 +24,6 @@
|
|||||||
# Override so we get a bare minimum set of base compute services
|
# Override so we get a bare minimum set of base compute services
|
||||||
# required to have nodepool function.
|
# required to have nodepool function.
|
||||||
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
||||||
# n-obj has been removed from mitaka
|
|
||||||
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
||||||
OVERRIDE_ENABLED_SERVICES+=,n-obj,
|
|
||||||
fi
|
|
||||||
export OVERRIDE_ENABLED_SERVICES
|
export OVERRIDE_ENABLED_SERVICES
|
||||||
export BRANCH_OVERRIDE={branch-override}
|
export BRANCH_OVERRIDE={branch-override}
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
@ -80,10 +76,6 @@
|
|||||||
# Override so we get a bare minimum set of base compute services
|
# Override so we get a bare minimum set of base compute services
|
||||||
# required to have nodepool function.
|
# required to have nodepool function.
|
||||||
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy
|
||||||
# n-obj has been removed from mitaka
|
|
||||||
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
|
||||||
OVERRIDE_ENABLED_SERVICES+=,n-obj,
|
|
||||||
fi
|
|
||||||
export OVERRIDE_ENABLED_SERVICES
|
export OVERRIDE_ENABLED_SERVICES
|
||||||
export BRANCH_OVERRIDE={branch-override}
|
export BRANCH_OVERRIDE={branch-override}
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
|
@ -1813,13 +1813,13 @@ jobs:
|
|||||||
branch: ^(stable/(liberty|mitaka|newton)|master)$
|
branch: ^(stable/(liberty|mitaka|newton)|master)$
|
||||||
|
|
||||||
- name: ^gate-requirements-tox-validate-ubuntu-xenial$
|
- name: ^gate-requirements-tox-validate-ubuntu-xenial$
|
||||||
branch: ^(?!stable/(kilo|liberty|mitaka)).*$
|
branch: ^(?!stable/mitaka).*$
|
||||||
|
|
||||||
- name: ^gate-requirements-tox-validate-projects-ubuntu-xenial$
|
- name: ^gate-requirements-tox-validate-projects-ubuntu-xenial$
|
||||||
branch: master
|
branch: master
|
||||||
|
|
||||||
- name: gate-requirements-tox-babel-ubuntu-xenial
|
- name: gate-requirements-tox-babel-ubuntu-xenial
|
||||||
branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$
|
branch: ^(?!stable/mitaka).*$
|
||||||
files:
|
files:
|
||||||
- '^babel-test/.*'
|
- '^babel-test/.*'
|
||||||
- '^tox.ini'
|
- '^tox.ini'
|
||||||
@ -2417,10 +2417,11 @@ jobs:
|
|||||||
|
|
||||||
- name: ^gate-.*-tox-checklang.*ubuntu-xenial$
|
- name: ^gate-.*-tox-checklang.*ubuntu-xenial$
|
||||||
# run this on all branches. The default ubuntu-xenial condition
|
# run this on all branches. The default ubuntu-xenial condition
|
||||||
# will not run this on older branches. We do not have a kilo
|
# will not run this on older branches. We do not have a
|
||||||
# branch but this allows to match all branches.
|
# thisbranchnamewillneverexist branch but this allows to match all
|
||||||
|
# branches.
|
||||||
# TODO(jaegerandi): Remove branch condition once mitaka is retired.
|
# TODO(jaegerandi): Remove branch condition once mitaka is retired.
|
||||||
branch: ^(?!stable/kilo).*$
|
branch: ^(?!stable/thisbranchnamewillneverexist).*$
|
||||||
# Only run job if at least one po or pot file was changed
|
# Only run job if at least one po or pot file was changed
|
||||||
files:
|
files:
|
||||||
- '^.*\.po$'
|
- '^.*\.po$'
|
||||||
@ -3252,15 +3253,15 @@ jobs:
|
|||||||
|
|
||||||
# Some projects do not have releasenotes until the Newton cycle
|
# Some projects do not have releasenotes until the Newton cycle
|
||||||
- name: ^gate-(manila-ui|networking-odl|oslo.(messaging|cache|concurrency|middleware|privsep|rootwrap|service|context|vmware|policy)|tacker)-releasenotes$
|
- name: ^gate-(manila-ui|networking-odl|oslo.(messaging|cache|concurrency|middleware|privsep|rootwrap|service|context|vmware|policy)|tacker)-releasenotes$
|
||||||
branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$
|
branch: ^(?!stable/mitaka).*$
|
||||||
|
|
||||||
# Some python client projects do not have releasenotes until the Ocata cycle
|
# Some python client projects do not have releasenotes until the Ocata cycle
|
||||||
- name: ^gate-python-(tripleo)client-releasenotes$
|
- name: ^gate-python-(tripleo)client-releasenotes$
|
||||||
branch: ^(?!stable/(?:kilo|liberty|mitaka|newton)).*$
|
branch: ^(?!stable/(?:mitaka|newton)).*$
|
||||||
|
|
||||||
# Some projects do not have releasenotes until the Ocata cycle
|
# Some projects do not have releasenotes until the Ocata cycle
|
||||||
- name: ^gate-(automaton|debtcollector|futurist|networking-sfc|osprofiler|oslo.(i18n|reports|serialization|utils|versionedobjects)|oslosphinx|oslotest|stevedore|taskflow|tooz)-releasenotes$
|
- name: ^gate-(automaton|debtcollector|futurist|networking-sfc|osprofiler|oslo.(i18n|reports|serialization|utils|versionedobjects)|oslosphinx|oslotest|stevedore|taskflow|tooz)-releasenotes$
|
||||||
branch: ^(?!stable/(?:kilo|liberty|mitaka|newton)).*$
|
branch: ^(?!stable/(?:mitaka|newton)).*$
|
||||||
|
|
||||||
- name: gate-python-fuelclient-python34
|
- name: gate-python-fuelclient-python34
|
||||||
branch: ^stable/(8\.0|mitaka).*$
|
branch: ^stable/(8\.0|mitaka).*$
|
||||||
|
Loading…
Reference in New Issue
Block a user