Merge "Switch openSUSE jobs to version 15"

This commit is contained in:
Zuul 2019-08-20 08:04:38 +00:00 committed by Gerrit Code Review
commit 028a25a43b
2 changed files with 10 additions and 16 deletions

View File

@ -56,15 +56,15 @@
test_clustered_elk: true
- job:
name: "openstack-ansible-ops:elk_metrics_6x-opensuse-423"
name: "openstack-ansible-ops:elk_metrics_6x-opensuse-15"
parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
nodeset: opensuse-423
voting: true
nodeset: opensuse-15
voting: false
- job:
name: "openstack-ansible-ops:elk_metrics_6x-opensuse-423-clustered"
name: "openstack-ansible-ops:elk_metrics_6x-opensuse-15-clustered"
parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
nodeset: opensuse-423
nodeset: opensuse-15
voting: false
vars:
osa_test_repo: "openstack/openstack-ansible-ops"
@ -153,11 +153,6 @@
nodeset: centos-7
- job:
name: "openstack-ansible-ops:skydive-opensuse-423"
name: "openstack-ansible-ops:skydive-opensuse-15"
parent: "openstack-ansible-ops:skydive-ubuntu-xenial"
nodeset: opensuse-423
# - job:
# name: "openstack-ansible-ops:skydive-opensuse-15"
# parent: "openstack-ansible-ops:skydive-ubuntu-xenial"
# nodeset: opensuse-15
nodeset: opensuse-15

View File

@ -21,8 +21,8 @@
- openstack-ansible-linters
- openstack-ansible-ops:elk_metrics_6x-centos-7
# - openstack-ansible-ops:elk_metrics_6x-centos-7-clustered
- openstack-ansible-ops:elk_metrics_6x-opensuse-423
# - openstack-ansible-ops:elk_metrics_6x-opensuse-423-clustered
- openstack-ansible-ops:elk_metrics_6x-opensuse-15
# - openstack-ansible-ops:elk_metrics_6x-opensuse-15-clustered
- openstack-ansible-ops:elk_metrics_6x-ubuntu-trusty
- openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial
- openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic
@ -36,8 +36,7 @@
- openstack-ansible-ops:skydive-ubuntu-xenial
- openstack-ansible-ops:skydive-ubuntu-bionic
- openstack-ansible-ops:skydive-centos-7
- openstack-ansible-ops:skydive-opensuse-423
# - openstack-ansible-ops:skydive-opensuse-15
- openstack-ansible-ops:skydive-opensuse-15
gate:
jobs:
- openstack-ansible-linters