opendev
/
system-config
Code Issues Proposed changes

Switch more puppet testing to xenial 

wiki, status, and single node ci should all run on xenial now. Switch
their testing to xenial from trusty.

Change-Id: I3a0c2faa47f2ec17809e3845c7226173188def63
This commit is contained in:
Clark Boylan 2020-01-29 13:32:06 -08:00
parent e28019282e
commit 71f952dc93
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -239,7 +239,7 @@ node /^etherpad-dev\d*\.open.*\.org$/ {
} }
} }
# Node-OS: trusty # Node-OS: xenial
node /^wiki\d+\.openstack\.org$/ { node /^wiki\d+\.openstack\.org$/ {
$group = "wiki" $group = "wiki"
class { 'openstack_project::wiki': class { 'openstack_project::wiki':
@ -261,7 +261,7 @@ node /^wiki\d+\.openstack\.org$/ {
} }
} }
# Node-OS: trusty # Node-OS: xenial
node /^wiki-dev\d+\.openstack\.org$/ { node /^wiki-dev\d+\.openstack\.org$/ {
$group = "wiki-dev" $group = "wiki-dev"
class { 'openstack_project::wiki': class { 'openstack_project::wiki':
@ -581,7 +581,6 @@ node /^zk\d+\.open.*\.org$/ {
} }
# A machine to serve various project status updates. # A machine to serve various project status updates.
# Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^status\d*\.open.*\.org$/ { node /^status\d*\.open.*\.org$/ {
$group = 'status' $group = 'status'
@ -1100,7 +1099,7 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
} }
} }
# Node-OS: trusty # Node-OS: xenial
# Used for testing all-in-one deployments # Used for testing all-in-one deployments
node 'single-node-ci.test.only' { node 'single-node-ci.test.only' {
include ::openstackci::single_node_ci include ::openstackci::single_node_ci