Stop gating Gnocchi
Change-Id: I260058e48198013f35c638cc3d78ef335637f298
This commit is contained in:
Julien Danjou
parent
4077a82b43
commit
e93717cefa
|
|
@ -140,24 +140,16 @@
|
|||
#!/bin/bash -xe
|
||||
export PYTHONUNBUFFERED=true
|
||||
|
||||
# NOTE(sileht): This job runs on Aodh, Ceilometer, and Gnocchi
|
||||
# NOTE(sileht): This job runs on Aodh and Ceilometer.
|
||||
# Gnocchi uses an independent release cycle. So we map here
|
||||
# which Gnocchi version can be used with other OpenStack
|
||||
# components and the reverse.
|
||||
gnocchi_branch=
|
||||
if [ "$ZUUL_PROJECT" == "openstack/gnocchi" ]; then
|
||||
case "$ZUUL_BRANCH" in
|
||||
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
|
||||
"stable/2.2"|"stable/3.0") export OVERRIDE_ZUUL_BRANCH=stable/newton ;;
|
||||
"stable/3.1") export OVERRIDE_ZUUL_BRANCH=stable/ocata ;;
|
||||
esac
|
||||
else
|
||||
case "$ZUUL_BRANCH" in
|
||||
"stable/mitaka") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1";;
|
||||
"stable/newton") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.0";;
|
||||
"stable/ocata") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1";;
|
||||
esac
|
||||
fi
|
||||
case "$ZUUL_BRANCH" in
|
||||
"stable/mitaka") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1";;
|
||||
"stable/newton") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.0";;
|
||||
"stable/ocata") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1";;
|
||||
esac
|
||||
|
||||
export DEVSTACK_GATE_HEAT=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
- job-template:
|
||||
name: '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}-{node}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
- build-timeout:
|
||||
timeout: 100
|
||||
- timestamps
|
||||
|
||||
builders:
|
||||
- link-logs
|
||||
- net-info
|
||||
- devstack-checkout
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
export PYTHONUNBUFFERED=true
|
||||
export PROJECTS="openstack/gnocchi $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
|
||||
|
||||
if [ "{storagedriver}" == "ceph" ]; then
|
||||
export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph"
|
||||
fi
|
||||
|
||||
case "$ZUUL_BRANCH" in
|
||||
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
|
||||
"stable/2.2"|"stable/3.0") export OVERRIDE_ZUUL_BRANCH=stable/newton ;;
|
||||
"stable/3.1") export OVERRIDE_ZUUL_BRANCH=stable/ocata ;;
|
||||
esac
|
||||
|
||||
function gate_hook {{
|
||||
cd /opt/stack/new/gnocchi/devstack/gate
|
||||
./gate_hook.sh {storagedriver} {sqldriver}
|
||||
}}
|
||||
export -f gate_hook
|
||||
|
||||
function post_test_hook {{
|
||||
cd /opt/stack/new/gnocchi/devstack/gate
|
||||
./post_test_hook.sh {storagedriver} {sqldriver}
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
publishers:
|
||||
- test-results
|
||||
- devstack-logs
|
||||
- console-log
|
||||
|
|
@ -5080,63 +5080,6 @@
|
|||
- python-jobs
|
||||
- pypi-jobs
|
||||
|
||||
- project:
|
||||
name: gnocchi
|
||||
|
||||
jobs:
|
||||
- python-jobs
|
||||
- gate-{name}-tox-{envlist}-{node}:
|
||||
envlist:
|
||||
- py27-postgresql
|
||||
- py34-postgresql
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
- gate-{name}-tox-{envlist}-{node}:
|
||||
node: ubuntu-xenial
|
||||
envlist:
|
||||
- py27-mysql
|
||||
- py35-mysql
|
||||
- py35-postgresql
|
||||
- py27-mysql-ceph-upgrade-from-2.2
|
||||
- py35-postgresql-file-upgrade-from-2.2
|
||||
- py27-mysql-ceph-upgrade-from-3.0
|
||||
- py35-postgresql-file-upgrade-from-3.0
|
||||
- py27-mysql-ceph-upgrade-from-3.1
|
||||
- py35-postgresql-file-upgrade-from-3.1
|
||||
- pypi-jobs
|
||||
- gate-{name}-bashate
|
||||
- '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}-{node}':
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
pipeline: gate
|
||||
storagedriver: file
|
||||
sqldriver: mysql
|
||||
- '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}-{node}':
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
pipeline: gate
|
||||
storagedriver: swift
|
||||
sqldriver: postgresql
|
||||
- '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}-{node}':
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
pipeline: gate
|
||||
storagedriver: ceph
|
||||
sqldriver: mysql
|
||||
- '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}-{node}':
|
||||
node: ubuntu-xenial
|
||||
pipeline: gate
|
||||
storagedriver: influxdb
|
||||
sqldriver: mysql
|
||||
- 'gate-telemetry-dsvm-integration-{name}-{node}':
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
|
||||
- project:
|
||||
name: golang-client
|
||||
|
||||
|
|
|
|||
|
|
@ -3182,13 +3182,6 @@ jobs:
|
|||
- name: ^gate-aodh-dsvm-tempest-plugin-(hbase|mongodb)-ubuntu-xenial
|
||||
branch: stable/newton
|
||||
|
||||
#NOTE (gordc): stable/2.1 mapped to stable/mitaka, can be removed accordingly
|
||||
- name: ^gate-telemetry-dsvm-integration-gnocchi-ubuntu-trusty
|
||||
branch: stable/2.1
|
||||
|
||||
- name: ^gate-telemetry-dsvm-integration-gnocchi-ubuntu-xenial
|
||||
branch: ^(?!stable/2\.1)
|
||||
|
||||
# TODO(lcastell): Make voting once tests are fixed
|
||||
- name: ^gate-craton-dashboard-nodejs4-npm-run-test$
|
||||
voting: false
|
||||
|
|
@ -3475,28 +3468,6 @@ jobs:
|
|||
- name: gate-python-keystoneclient-requirements
|
||||
branch: ^(?!feature/keystoneauth_integration).*$
|
||||
|
||||
- name: ^gate-gnocchi-tox-py35
|
||||
branch: ^(?!stable/2\.[01])
|
||||
|
||||
- name: ^gate-gnocchi-tox-.+-upgrade-from-2.2-ubuntu-xenial
|
||||
branch: ^stable/3\.1$
|
||||
|
||||
- name: ^gate-gnocchi-tox-.+-upgrade-from-3.0-ubuntu-xenial
|
||||
branch: ^stable/3\.1$
|
||||
|
||||
- name: ^gate-gnocchi-tox-.+-upgrade-from-3.1-ubuntu-xenial
|
||||
branch: ^master$
|
||||
|
||||
# Use Ubuntu Trusty for stable/2.*
|
||||
# (i.e. everything that is before Newton)
|
||||
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-trusty
|
||||
branch: ^(stable/2\.[01])
|
||||
|
||||
# Use Ubuntu Xenial for stable/3.0 and stable/3.1 (i.e. Newton and Ocata)
|
||||
# After 3.1, Gnocchi run functional tests within the default pyXX target
|
||||
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-xenial
|
||||
branch: ^(stable/3\.[01])
|
||||
|
||||
- name: ^gate-sahara-cli.*$
|
||||
skip-if:
|
||||
- project: ^openstack/sahara-tests$
|
||||
|
|
@ -10456,62 +10427,7 @@ projects:
|
|||
- name: openstack/gnocchi
|
||||
template:
|
||||
- name: merge-check
|
||||
- name: publish-to-pypi
|
||||
check:
|
||||
- gate-gnocchi-pep8-ubuntu-trusty
|
||||
- gate-gnocchi-docs-ubuntu-trusty
|
||||
- gate-gnocchi-pep8-ubuntu-xenial
|
||||
- gate-gnocchi-docs-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-tox-py34-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-tox-py35-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-2.2-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-2.2-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-3.0-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-3.0-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-3.1-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-3.1-ubuntu-xenial
|
||||
- gate-gnocchi-bashate
|
||||
- gate-gnocchi-dsvm-functional-file-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-swift-postgresql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-ceph-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-file-mysql-ubuntu-trusty
|
||||
- gate-gnocchi-dsvm-functional-swift-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-dsvm-functional-ceph-mysql-ubuntu-trusty
|
||||
- gate-telemetry-dsvm-integration-gnocchi-ubuntu-trusty
|
||||
- gate-telemetry-dsvm-integration-gnocchi-ubuntu-xenial
|
||||
- gate-tripleo-ci-centos-7-scenario001-multinode-oooq-puppet-nv
|
||||
gate:
|
||||
- gate-gnocchi-pep8-ubuntu-trusty
|
||||
- gate-gnocchi-docs-ubuntu-trusty
|
||||
- gate-gnocchi-pep8-ubuntu-xenial
|
||||
- gate-gnocchi-docs-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-tox-py34-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-tox-py35-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-2.2-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-2.2-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-3.0-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-3.0-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py27-mysql-ceph-upgrade-from-3.1-ubuntu-xenial
|
||||
- gate-gnocchi-tox-py35-postgresql-file-upgrade-from-3.1-ubuntu-xenial
|
||||
- gate-gnocchi-bashate
|
||||
- gate-gnocchi-dsvm-functional-file-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-swift-postgresql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-ceph-mysql-ubuntu-xenial
|
||||
- gate-gnocchi-dsvm-functional-file-mysql-ubuntu-trusty
|
||||
- gate-gnocchi-dsvm-functional-swift-postgresql-ubuntu-trusty
|
||||
- gate-gnocchi-dsvm-functional-ceph-mysql-ubuntu-trusty
|
||||
- gate-telemetry-dsvm-integration-gnocchi-ubuntu-trusty
|
||||
- gate-telemetry-dsvm-integration-gnocchi-ubuntu-xenial
|
||||
post:
|
||||
- gnocchi-branch-tarball
|
||||
experimental:
|
||||
- gate-gnocchi-dsvm-functional-influxdb-mysql-ubuntu-xenial
|
||||
- name: noop-jobs
|
||||
|
||||
- name: openstack/golang-client
|
||||
template:
|
||||
|
|
|
|||
Loading…
Reference in New Issue