Reparent 7-3 node jobs for zuul-v3
- Add 7-3 nodeset - Reparent legacy jobs to use this nodeset - Remove scenario005 test - was never used - Ensure hosts are added in order to subnodes file Change-Id: I78c74cc54fc0c0d5b39a00ee35c95bbcfda8055e
This commit is contained in:
parent
603ee03a32
commit
31089df720
|
@ -28,6 +28,7 @@
|
|||
lineinfile:
|
||||
path: /etc/nodepool/sub_nodes_private
|
||||
line: "{{ hostvars[item]['nodepool']['private_ipv4'] }}"
|
||||
insertafter: EOF
|
||||
with_items: "{{ groups['subnodes'] }}"
|
||||
when: groups['subnodes'] is defined
|
||||
- name: Create nodepool primary file
|
||||
|
|
|
@ -82,7 +82,6 @@
|
|||
name: tripleo-multinode-experimental
|
||||
experimental:
|
||||
jobs:
|
||||
- tripleo-ci-centos-7-scenario005-multinode-oooq
|
||||
- tripleo-ci-centos-7-scenario006-multinode-oooq
|
||||
- tripleo-ci-centos-7-scenario010-multinode-oooq-container
|
||||
- tripleo-ci-centos-7-scenario011-multinode-oooq-container
|
||||
|
@ -96,12 +95,11 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-3nodes-multinode
|
||||
parent: tripleo-ci-dsvm-multinode
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
parent: tripleo-ci-base
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
voting: false
|
||||
nodeset: legacy-centos-7-3-node
|
||||
nodeset: three-centos-7-nodes
|
||||
branches: ^(?!stable/(newton|ocata|pike)).*$
|
||||
vars:
|
||||
toci_jobtype: multinode-2ctlr-featureset032
|
||||
|
@ -255,21 +253,6 @@
|
|||
nodes: 1ctlr
|
||||
featureset: 019
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-scenario005-multinode-oooq
|
||||
parent: tripleo-ci-dsvm-multinode
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
nodeset: legacy-centos-7-4-node
|
||||
voting: false
|
||||
branches: ^(?!stable/newton).*$
|
||||
vars:
|
||||
toci_jobtype: multinode-1ctlr-featureset009
|
||||
environment_type: multinode
|
||||
nodes: 1ctlr
|
||||
featureset: 009
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-scenario006-multinode-oooq
|
||||
parent: tripleo-ci-base
|
||||
|
|
|
@ -27,3 +27,25 @@
|
|||
- primary
|
||||
- name: peers
|
||||
nodes: []
|
||||
|
||||
- nodeset:
|
||||
name: three-centos-7-nodes
|
||||
nodes:
|
||||
- name: primary
|
||||
label: centos-7
|
||||
- name: secondary-1
|
||||
label: centos-7
|
||||
- name: secondary-2
|
||||
label: centos-7
|
||||
groups:
|
||||
- name: switch
|
||||
nodes:
|
||||
- primary
|
||||
- name: peers
|
||||
nodes:
|
||||
- secondary-1
|
||||
- secondary-2
|
||||
- name: subnodes
|
||||
nodes:
|
||||
- secondary-1
|
||||
- secondary-2
|
||||
|
|
Loading…
Reference in New Issue