From 06ad7cc7f609bf318ef5d15948bc4a235f32acfd Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Sat, 11 Jul 2020 16:43:10 -0500 Subject: [PATCH] Inherit playbook from common osh-infra parent for fuctional jobs Change-Id: I7e7d090312ee577314509cd848adf76cabda6aad Signed-off-by: Andrii Ostapenko --- zuul.d/jobs.yaml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 561464cf0e..5e1fc3edf8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -27,6 +27,8 @@ - job: name: openstack-helm-infra-functional + run: playbooks/osh-infra-gate-runner.yaml + abstract: true irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -52,7 +54,6 @@ - playbooks/osh-infra-deploy-selenium.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml vars: gate_scripts_relative_path: ../openstack-helm-infra @@ -96,7 +97,6 @@ - playbooks/osh-infra-deploy-selenium.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml vars: gate_scripts_relative_path: ../openstack-helm-infra @@ -133,7 +133,6 @@ pre-run: - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-selenium.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -159,7 +158,6 @@ timeout: 7200 pre-run: - playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -182,7 +180,6 @@ pre-run: - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-selenium.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -216,7 +213,6 @@ pre-run: - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-selenium.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -242,7 +238,6 @@ pre-run: - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-selenium.yaml - run: playbooks/osh-infra-gate-runner.yaml nodeset: openstack-helm-single-node vars: gate_scripts_relative_path: ../openstack-helm-infra @@ -274,7 +269,6 @@ parent: openstack-helm-infra-functional timeout: 9600 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -310,7 +304,6 @@ pre-run: - playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-deploy-selenium.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -339,7 +332,6 @@ parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml required-projects: - openstack/openstack-helm post-run: playbooks/osh-infra-collect-logs.yaml @@ -373,7 +365,6 @@ parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -393,7 +384,6 @@ parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml required-projects: - openstack/openstack-helm post-run: playbooks/osh-infra-collect-logs.yaml @@ -439,7 +429,6 @@ name: openstack-helm-infra-kubernetes-keystone-auth parent: openstack-helm-infra nodeset: openstack-helm-single-node - run: playbooks/osh-infra-gate-runner.yaml required-projects: - openstack/openstack-helm vars: @@ -461,7 +450,6 @@ parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -490,7 +478,6 @@ - playbooks/osh-infra-deploy-docker.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: - playbooks/osh-infra-collect-logs.yaml - playbooks/gather-armada-manifests.yaml @@ -513,7 +500,6 @@ - playbooks/osh-infra-deploy-docker.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: - playbooks/osh-infra-collect-logs.yaml - playbooks/gather-armada-manifests.yaml @@ -537,7 +523,6 @@ - playbooks/osh-infra-deploy-docker.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: - playbooks/osh-infra-collect-logs.yaml - playbooks/gather-armada-manifests.yaml @@ -557,7 +542,6 @@ nodeset: openstack-helm-single-node pre-run: - playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml vars: gate_scripts_relative_path: ../openstack-helm-infra gate_scripts: @@ -572,7 +556,6 @@ timeout: 7200 pre-run: - playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: @@ -589,7 +572,6 @@ timeout: 7200 pre-run: - playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node vars: