From 86b7b31400831b6da3a594fd630ccac0865f62a4 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Sat, 30 Sep 2017 07:07:42 -0700 Subject: [PATCH] Fix kolla-kubernetes nodesets The conversion changed all kolla-kubernetes jobs to single node ubuntu jobs. This PS fixes that. Change-Id: I845d38c0a530b547b95ec75d23d3e53ad653cdbf --- zuul.d/zuul-legacy-jobs.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 5edda328..2b6da1a6 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -4093,6 +4093,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph/post + nodeset: centos-7 timeout: 3600 - job: @@ -4100,6 +4101,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph-multi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph-multi/post + nodeset: centos-7-2-node timeout: 3600 - job: @@ -4107,6 +4109,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph-reboot/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-ceph-reboot/post + nodeset: centos-7-2-node timeout: 3600 - job: @@ -4114,6 +4117,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-external-ovs/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-external-ovs/post + nodeset: centos-7 timeout: 3600 - job: @@ -4121,6 +4125,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-compute-kit/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-compute-kit/post + nodeset: centos-7 timeout: 3600 - job: @@ -4128,6 +4133,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-entrypoint/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-entrypoint/post + nodeset: centos-7 timeout: 3600 - job: @@ -4135,6 +4141,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-operator/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-helm-operator/post + nodeset: centos-7 timeout: 3600 - job: @@ -4142,6 +4149,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-iscsi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-2-iscsi/post + nodeset: centos-7 timeout: 3600 - job: @@ -4149,6 +4157,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-3-ceph-multi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-3-ceph-multi/post + nodeset: centos-7-2-node timeout: 3600 - job: @@ -4156,6 +4165,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-ceph-multi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-ceph-multi/post + nodeset: centos-7-2-node timeout: 3600 - job: @@ -4163,6 +4173,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-helm-compute-kit/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-helm-compute-kit/post + nodeset: centos-7 timeout: 3600 - job: @@ -4170,6 +4181,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-helm-entrypoint/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-4-helm-entrypoint/post + nodeset: centos-7 timeout: 3600 - job: @@ -4177,6 +4189,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-t-ceph-multi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-binary-t-ceph-multi/post + nodeset: centos-7-2-node timeout: 3600 - job: @@ -4184,6 +4197,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-helm-compute-kit/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-helm-compute-kit/post + nodeset: centos-7 timeout: 3600 - job: @@ -4191,6 +4205,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-helm-entrypoint/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-helm-entrypoint/post + nodeset: centos-7 timeout: 3600 - job: @@ -4198,6 +4213,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-ironic/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-ironic/post + nodeset: centos-7 timeout: 3600 - job: @@ -4205,6 +4221,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-microchart-ansible/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-4-microchart-ansible/post + nodeset: centos-7 timeout: 3600 - job: @@ -4212,6 +4229,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-t-iscsi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-centos-source-t-iscsi/post + nodeset: centos-7 timeout: 3600 - job: @@ -4219,6 +4237,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-binary-2-ceph/run post-run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-binary-2-ceph/post + nodeset: ubuntu-xenial timeout: 3600 - job: @@ -4226,6 +4245,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/post + nodeset: ubuntu-xenial timeout: 3600 - job: @@ -4233,6 +4253,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-4-ironic/run post-run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-4-ironic/post + nodeset: ubuntu-xenial timeout: 3600 - job: @@ -4240,6 +4261,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-4-microchart-ansible/run post-run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-4-microchart-ansible/post + nodeset: ubuntu-xenial timeout: 3600 - job: @@ -4247,6 +4269,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-t-iscsi/run post-run: playbooks/legacy/kolla-kubernetes-deploy-ubuntu-source-t-iscsi/post + nodeset: ubuntu-xenial timeout: 3600 - job: @@ -4254,6 +4277,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-upgrade-centos-binary-2-ceph/run post-run: playbooks/legacy/kolla-kubernetes-upgrade-centos-binary-2-ceph/post + nodeset: centos-7 timeout: 3600 - job: @@ -4261,6 +4285,7 @@ parent: legacy-kolla-kubernetes-base run: playbooks/legacy/kolla-kubernetes-upgrade-centos-binary-3-ceph/run post-run: playbooks/legacy/kolla-kubernetes-upgrade-centos-binary-3-ceph/post + nodeset: centos-7 timeout: 3600 - job: