Migrate kolla jobs to centos-7 dib

This is part of our effort to migrate from devstack-centos7 to
centos-7 dibs.

Change-Id: I2ff5fbb315832b8cf07c93d0dd0cdaacd958631e
Depends-On: Ie30c8437b310d1ea5bc75307375c255131dfe934
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-04-04 16:05:15 -04:00
parent 73f591ba4b
commit f331bd3aaa
3 changed files with 6 additions and 42 deletions

View File

@ -2,28 +2,6 @@
name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 90
- timestamps
builders:
- link-logs
- net-info
- gerrit-git-prep
- shell: |
#!/bin/bash -xe
tools/setup_gate.sh
tox -e {action}-{distro}-{type}
publishers:
- console-log
- devstack-logs
- job-template:
name: '{pipeline}-kolla-bindep-{action}-{distro}-{type}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 90

View File

@ -2772,37 +2772,25 @@
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build
distro: centos
node: 'devstack-centos7'
pipeline: gate
type: binary
- '{pipeline}-kolla-bindep-{action}-{distro}-{type}':
action: build
distro: centos-7
node: 'centos-7'
pipeline: gate
type: binary
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy
distro: centos
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: binary
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build
distro: centos
node: 'devstack-centos7'
pipeline: gate
type: source
- '{pipeline}-kolla-bindep-{action}-{distro}-{type}':
action: build
distro: centos-7
node: 'centos-7'
pipeline: gate
type: source
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy
distro: centos
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: source
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
@ -2832,25 +2820,25 @@
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build
distro: oraclelinux
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: binary
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy
distro: oraclelinux
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: binary
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build
distro: oraclelinux
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: source
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy
distro: oraclelinux
node: 'devstack-centos7'
node: 'centos-7'
pipeline: gate
type: source
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':

View File

@ -6840,8 +6840,6 @@ projects:
- gate-kolla-dsvm-deploy-ubuntu-binary
- gate-kolla-dsvm-deploy-ubuntu-source
experimental:
- gate-kolla-bindep-build-centos-7-binary
- gate-kolla-bindep-build-centos-7-source
- gate-kolla-dsvm-deploy-multinode-ubuntu-source
- gate-kolla-dsvm-build-oraclelinux-binary
- gate-kolla-dsvm-deploy-oraclelinux-binary