Remove juno handling from Jenkins
With Juno EOL, we do not need to check for stable/juno anymore. Remove handling of stable/juno from jenkins jobs. Also remove special -juno jobs from both jenkins and zuul for trove and devstack-gate. Change-Id: I41f31ea1f15ffe71b57197040dac3bb447900dad
This commit is contained in:
parent
37368d43c8
commit
bfedf51151
@ -165,7 +165,7 @@
|
|||||||
export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient
|
export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
||||||
# NOTE(sileht): in liberty and kilo telemetry-alarming was in ceilometer code tree
|
# NOTE(sileht): in liberty and kilo telemetry-alarming was in ceilometer code tree
|
||||||
if [[ "$ZUUL_BRANCH" != "stable/juno" && "$ZUUL_BRANCH" != "stable/kilo" && "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
|
if [[ "$ZUUL_BRANCH" != "stable/kilo" && "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
|
||||||
export PROJECTS="openstack/aodh $PROJECTS"
|
export PROJECTS="openstack/aodh $PROJECTS"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
||||||
fi
|
fi
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
||||||
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
||||||
|
|
||||||
if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
||||||
# Juno/Kilo/Liberty version uses the older 'hooks' approach to adding
|
# Kilo/Liberty version uses the older 'hooks' approach to adding
|
||||||
# the Designate plugin
|
# the Designate plugin
|
||||||
|
|
||||||
function gate_hook {{
|
function gate_hook {{
|
||||||
@ -98,8 +98,8 @@
|
|||||||
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
export PROJECTS="openstack/python-designateclient $PROJECTS"
|
||||||
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
export PROJECTS="openstack/designate-dashboard $PROJECTS"
|
||||||
|
|
||||||
if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
||||||
# Juno/Kilo/Liberty version uses the older 'hooks' approach to adding
|
# Kilo/Liberty version uses the older 'hooks' approach to adding
|
||||||
# the Designate plugin
|
# the Designate plugin
|
||||||
|
|
||||||
function gate_hook {{
|
function gate_hook {{
|
||||||
|
@ -77,7 +77,7 @@
|
|||||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||||
export KEEP_LOCALRC=1
|
export KEEP_LOCALRC=1
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
||||||
if [[ "$ZUUL_BRANCH" == "stable/juno" || "$ZUUL_BRANCH" == "stable/kilo" ]]; then
|
if [[ "$ZUUL_BRANCH" == "stable/kilo" ]]; then
|
||||||
services+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
|
services+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
|
||||||
else
|
else
|
||||||
export PROJECTS="openstack/aodh"
|
export PROJECTS="openstack/aodh"
|
||||||
|
@ -152,10 +152,7 @@
|
|||||||
export DEVSTACK_GATE_NEUTRON=1
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||||
export BRANCH_OVERRIDE={branch-override}
|
export BRANCH_OVERRIDE={branch-override}
|
||||||
# Gate hooks previous to kilo will break if PROJECTS is overridden
|
export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
|
||||||
if [[ ! "$BRANCH_OVERRIDE" == "stable/juno" ]] && [[ ! "$ZUUL_BRANCH" == "stable/juno" ]] ; then
|
|
||||||
export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
|
|
||||||
fi
|
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
@ -853,11 +853,6 @@
|
|||||||
job-suffix: ''
|
job-suffix: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
# Stable gate jobs for branchless tempest
|
# Stable gate jobs for branchless tempest
|
||||||
- devstack-jobs:
|
|
||||||
pipeline: gate
|
|
||||||
node: 'devstack-precise || devstack-trusty'
|
|
||||||
job-suffix: '-juno'
|
|
||||||
branch-override: stable/juno
|
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: 'devstack-precise || devstack-trusty'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
@ -870,11 +865,6 @@
|
|||||||
branch-override: stable/liberty
|
branch-override: stable/liberty
|
||||||
# Stable check jobs for testing devstack gate
|
# Stable check jobs for testing devstack gate
|
||||||
# tempest also uses these job definitions
|
# tempest also uses these job definitions
|
||||||
- devstack-jobs:
|
|
||||||
pipeline: gate
|
|
||||||
node: 'devstack-precise || devstack-trusty'
|
|
||||||
job-suffix: '-juno-nv'
|
|
||||||
branch-override: stable/juno
|
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: 'devstack-precise || devstack-trusty'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
@ -886,11 +876,6 @@
|
|||||||
job-suffix: '-liberty-nv'
|
job-suffix: '-liberty-nv'
|
||||||
branch-override: stable/liberty
|
branch-override: stable/liberty
|
||||||
# Periodic jobs for various branches
|
# Periodic jobs for various branches
|
||||||
- devstack-jobs:
|
|
||||||
pipeline: periodic
|
|
||||||
node: 'devstack-precise || devstack-trusty'
|
|
||||||
job-suffix: '-juno'
|
|
||||||
branch-override: stable/juno
|
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: periodic
|
pipeline: periodic
|
||||||
node: 'devstack-precise || devstack-trusty'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
@ -7359,10 +7344,6 @@
|
|||||||
datastore: 'mysql'
|
datastore: 'mysql'
|
||||||
job-suffix: '-kilo'
|
job-suffix: '-kilo'
|
||||||
branch-override: stable/kilo
|
branch-override: stable/kilo
|
||||||
- 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
|
|
||||||
datastore: 'mysql'
|
|
||||||
job-suffix: '-juno'
|
|
||||||
branch-override: stable/juno
|
|
||||||
- 'gate-trove-buildimage-{datastore}':
|
- 'gate-trove-buildimage-{datastore}':
|
||||||
datastore: 'mysql'
|
datastore: 'mysql'
|
||||||
- 'gate-trove-buildimage-{datastore}':
|
- 'gate-trove-buildimage-{datastore}':
|
||||||
|
@ -2325,9 +2325,6 @@ projects:
|
|||||||
- gate-grenade-dsvm-multinode
|
- gate-grenade-dsvm-multinode
|
||||||
- gate-neutron-dsvm-functional-nv
|
- gate-neutron-dsvm-functional-nv
|
||||||
- gate-swift-dsvm-functional-nv
|
- gate-swift-dsvm-functional-nv
|
||||||
- gate-tempest-dsvm-full-juno-nv
|
|
||||||
- gate-tempest-dsvm-neutron-full-juno-nv
|
|
||||||
- gate-tempest-dsvm-postgres-full-juno-nv
|
|
||||||
- gate-tempest-dsvm-full-kilo-nv
|
- gate-tempest-dsvm-full-kilo-nv
|
||||||
- gate-tempest-dsvm-neutron-full-kilo-nv
|
- gate-tempest-dsvm-neutron-full-kilo-nv
|
||||||
- gate-tempest-dsvm-postgres-full-kilo-nv
|
- gate-tempest-dsvm-postgres-full-kilo-nv
|
||||||
@ -9495,11 +9492,9 @@ projects:
|
|||||||
check:
|
check:
|
||||||
- gate-trove-functional-dsvm-mysql
|
- gate-trove-functional-dsvm-mysql
|
||||||
- gate-trove-functional-dsvm-mysql-kilo
|
- gate-trove-functional-dsvm-mysql-kilo
|
||||||
- gate-trove-functional-dsvm-mysql-juno
|
|
||||||
gate:
|
gate:
|
||||||
- gate-trove-functional-dsvm-mysql
|
- gate-trove-functional-dsvm-mysql
|
||||||
- gate-trove-functional-dsvm-mysql-kilo
|
- gate-trove-functional-dsvm-mysql-kilo
|
||||||
- gate-trove-functional-dsvm-mysql-juno
|
|
||||||
experimental:
|
experimental:
|
||||||
- gate-trove-buildimage-mysql
|
- gate-trove-buildimage-mysql
|
||||||
- gate-trove-buildimage-percona
|
- gate-trove-buildimage-percona
|
||||||
|
Loading…
Reference in New Issue
Block a user