Switch ansible-role-functional-jobs-centos7 to centos-7

Confirmed by the non-voting jobs, we can now move the voting jobs off
devstack-centos7.

Change-Id: I9b09a45f36fc34323ffe818a471491e7f8d8635c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2016-03-31 13:30:30 -04:00
parent 7b10caef73
commit 7a5c580576
2 changed files with 3 additions and 27 deletions

View File

@@ -14,26 +14,6 @@
publishers:
- console-log
- job-template:
name: '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}'
node: 'devstack-{ostype}'
builders:
- print-template-name:
template-name: "{template-name}"
- zuul-git-prep
- shell: |
# Allow Jenkins user to ssh into localhost
ssh-keygen -f ~/.ssh/id_rsa -N ""
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
ssh-keyscan localhost >> ~/.ssh/known_hosts
ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
- tox:
envlist: functional
publishers:
- console-log
- job-group:
# TODO(pabelanger): Remove in favor of ansible-role-jobs
name: 'ansible-lint-jobs'
@@ -66,11 +46,6 @@
jobs:
- 'gate-{name}-docs'
- 'gate-{name}-linters'
- '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}':
job-suffix: ''
ostype:
- centos7
pipeline: gate
- '{pipeline}-{name}-ansible-func-{ostype}{job-suffix}':
job-suffix: '-nv'
ostype:
@@ -80,5 +55,6 @@
- '{pipeline}-{name}-ansible-func-{ostype}{job-suffix}':
job-suffix: ''
ostype:
- centos-7
- ubuntu-trusty
pipeline: gate