diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index 28a27eded5..99c1fa81ad 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -165,7 +165,7 @@ export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient 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 - 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 DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" fi diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index 71f7df48e4..a7378f6a48 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -24,8 +24,8 @@ export PROJECTS="openstack/python-designateclient $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS" - if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Juno/Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + # Kilo/Liberty version uses the older 'hooks' approach to adding # the Designate plugin function gate_hook {{ @@ -98,8 +98,8 @@ export PROJECTS="openstack/python-designateclient $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS" - if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Juno/Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + # Kilo/Liberty version uses the older 'hooks' approach to adding # the Designate plugin function gate_hook {{ diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 5bafe59790..7151a15091 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -77,7 +77,7 @@ export DEVSTACK_GATE_INSTALL_TESTONLY=1 export KEEP_LOCALRC=1 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 else export PROJECTS="openstack/aodh" diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 703d079874..19d9605063 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -152,10 +152,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export BRANCH_OVERRIDE={branch-override} - # Gate hooks previous to kilo will break if PROJECTS is overridden - if [[ ! "$BRANCH_OVERRIDE" == "stable/juno" ]] && [[ ! "$ZUUL_BRANCH" == "stable/juno" ]] ; then - export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron" - fi + export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index d40bdba063..d37c8d9930 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -853,11 +853,6 @@ job-suffix: '' branch-override: default # Stable gate jobs for branchless tempest - - devstack-jobs: - pipeline: gate - node: 'devstack-precise || devstack-trusty' - job-suffix: '-juno' - branch-override: stable/juno - devstack-jobs: pipeline: gate node: 'devstack-precise || devstack-trusty' @@ -870,11 +865,6 @@ branch-override: stable/liberty # Stable check jobs for testing devstack gate # 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: pipeline: gate node: 'devstack-precise || devstack-trusty' @@ -886,11 +876,6 @@ job-suffix: '-liberty-nv' branch-override: stable/liberty # Periodic jobs for various branches - - devstack-jobs: - pipeline: periodic - node: 'devstack-precise || devstack-trusty' - job-suffix: '-juno' - branch-override: stable/juno - devstack-jobs: pipeline: periodic node: 'devstack-precise || devstack-trusty' @@ -7359,10 +7344,6 @@ datastore: 'mysql' job-suffix: '-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}': datastore: 'mysql' - 'gate-trove-buildimage-{datastore}': diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 931727ccde..d505e2b536 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2325,9 +2325,6 @@ projects: - gate-grenade-dsvm-multinode - gate-neutron-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-neutron-full-kilo-nv - gate-tempest-dsvm-postgres-full-kilo-nv @@ -9495,11 +9492,9 @@ projects: check: - gate-trove-functional-dsvm-mysql - gate-trove-functional-dsvm-mysql-kilo - - gate-trove-functional-dsvm-mysql-juno gate: - gate-trove-functional-dsvm-mysql - gate-trove-functional-dsvm-mysql-kilo - - gate-trove-functional-dsvm-mysql-juno experimental: - gate-trove-buildimage-mysql - gate-trove-buildimage-percona