From 838094163593ed2572f17e039c9cc5b908cf927d Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 27 Aug 2024 19:08:06 +0530 Subject: [PATCH] Move automation default vars into seperate scenario files https://github.com/openstack-k8s-operators/architecture/pull/374 adds the trigger job which will run different Baremetal VA jobs downstream on different architecture file changes. Currently automation/vars/default.yaml contains different multiple scenarios, stored in a single file. Trigger job may run unwanted jobs downstream without testing the proper architecture changes. By moving automations vars into different scenario files allow us to run selective trigger job and test the proper prs. Signed-off-by: Chandan Kumar (raukadah) --- automation/vars/default.yaml | 299 -------------------- automation/vars/hci.yaml | 78 +++++ automation/vars/nfv-ovs-dpdk-sriov-hci.yaml | 78 +++++ automation/vars/ovs-dpdk-sriov.yaml | 49 ++++ automation/vars/ovs-dpdk.yaml | 49 ++++ automation/vars/sriov.yaml | 49 ++++ 6 files changed, 303 insertions(+), 299 deletions(-) delete mode 100644 automation/vars/default.yaml create mode 100644 automation/vars/hci.yaml create mode 100644 automation/vars/nfv-ovs-dpdk-sriov-hci.yaml create mode 100644 automation/vars/ovs-dpdk-sriov.yaml create mode 100644 automation/vars/ovs-dpdk.yaml create mode 100644 automation/vars/sriov.yaml diff --git a/automation/vars/default.yaml b/automation/vars/default.yaml deleted file mode 100644 index 29840be5f..000000000 --- a/automation/vars/default.yaml +++ /dev/null @@ -1,299 +0,0 @@ ---- -vas: - hci: - stages: - - path: examples/va/hci/control-plane/nncp - wait_conditions: - - >- - oc -n openstack wait nncp - -l osp/nncm-config-type=standard - --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured - --timeout=5m - values: - - name: network-values - src_file: values.yaml - build_output: nncp.yaml - - - path: examples/va/hci/control-plane - wait_conditions: - - >- - oc -n openstack wait osctlplane controlplane --for condition=Ready - --timeout=60m - values: - - name: service-values - src_file: service-values.yaml - - name: network-values - src_file: nncp/values.yaml - build_output: ../control-plane.yaml - - - path: examples/va/hci/edpm-pre-ceph/nodeset - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=10m - values: - - name: edpm-nodeset-values - src_file: values.yaml - build_output: nodeset-pre-ceph.yaml - - - path: examples/va/hci/edpm-pre-ceph/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=30m - values: - - name: edpm-deployment-values - src_file: values.yaml - build_output: deployment-pre-ceph.yaml - post_stage_run: - - name: Deploy Ceph - type: playbook - source: "../../playbooks/ceph.yml" - inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml" - - - path: examples/va/hci - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=10m - values: - - name: service-values - src_file: service-values.yaml - - name: edpm-nodeset-values-post-ceph - src_file: values.yaml - build_output: nodeset-post-ceph.yaml - - - path: examples/va/hci/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=40m - values: - - name: edpm-deployment-values-post-ceph - src_file: values.yaml - build_output: deployment-post-ceph.yaml - - sriov: - stages: - - path: examples/va/nfv/sriov/nncp - wait_conditions: - - >- - oc -n openstack wait nncp - -l osp/nncm-config-type=standard - --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured - --timeout=60s - values: - - name: network-values - src_file: values.yaml - build_output: nncp.yaml - - - path: examples/va/nfv/sriov - wait_conditions: - - >- - oc -n openstack wait osctlplane controlplane --for condition=Ready - --timeout=600s - values: - - name: network-values - src_file: nncp/values.yaml - - name: service-values - src_file: service-values.yaml - build_output: control-plane.yaml - - - path: examples/va/nfv/sriov/edpm/nodeset - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=60m - values: - - name: edpm-nodeset-values - src_file: values.yaml - build_output: nodeset.yaml - - - path: examples/va/nfv/sriov/edpm/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=60m - values: - - name: edpm-deployment-values - src_file: values.yaml - build_output: deployment.yaml - - ovs-dpdk: - stages: - - path: examples/va/nfv/ovs-dpdk/nncp - wait_conditions: - - >- - oc -n openstack wait nncp - -l osp/nncm-config-type=standard - --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured - --timeout=60s - values: - - name: network-values - src_file: values.yaml - build_output: nncp.yaml - - - path: examples/va/nfv/ovs-dpdk - wait_conditions: - - >- - oc -n openstack wait osctlplane controlplane --for condition=Ready - --timeout=600s - values: - - name: network-values - src_file: nncp/values.yaml - - name: service-values - src_file: service-values.yaml - build_output: control-plane.yaml - - - path: examples/va/nfv/ovs-dpdk/edpm/nodeset - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=60m - values: - - name: edpm-nodeset-values - src_file: values.yaml - build_output: nodeset.yaml - - - path: examples/va/nfv/ovs-dpdk/edpm/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=60m - values: - - name: edpm-deployment-values - src_file: values.yaml - build_output: deployment.yaml - - ovs-dpdk-sriov: - stages: - - path: examples/va/nfv/ovs-dpdk-sriov/nncp - wait_conditions: - - >- - oc -n openstack wait nncp - -l osp/nncm-config-type=standard - --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured - --timeout=60s - values: - - name: network-values - src_file: values.yaml - build_output: nncp.yaml - - - path: examples/va/nfv/ovs-dpdk-sriov - wait_conditions: - - >- - oc -n openstack wait osctlplane controlplane --for condition=Ready - --timeout=1200s - values: - - name: network-values - src_file: nncp/values.yaml - - name: service-values - src_file: service-values.yaml - build_output: control-plane.yaml - - - path: examples/va/nfv/ovs-dpdk-sriov/edpm/nodeset - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=60m - values: - - name: edpm-nodeset-values - src_file: values.yaml - build_output: nodeset.yaml - - - path: examples/va/nfv/ovs-dpdk-sriov/edpm/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=60m - values: - - name: edpm-deployment-values - src_file: values.yaml - build_output: deployment.yaml - - nfv-ovs-dpdk-sriov-hci: - stages: - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp - wait_conditions: - - >- - oc -n openstack wait nncp - -l osp/nncm-config-type=standard - --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured - --timeout=5m - values: - - name: network-values - src_file: values.yaml - build_output: nncp.yaml - - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane - wait_conditions: - - >- - oc -n openstack wait osctlplane controlplane --for condition=Ready - --timeout=60m - values: - - name: service-values - src_file: service-values.yaml - - name: network-values - src_file: nncp/values.yaml - build_output: ../control-plane.yaml - - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/nodeset - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=60m - values: - - name: edpm-nodeset-values - src_file: values.yaml - build_output: nodeset-pre-ceph.yaml - - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=60m - values: - - name: edpm-deployment-values - src_file: values.yaml - build_output: deployment-pre-ceph.yaml - post_stage_run: - - name: Deploy Ceph - type: playbook - source: "../../playbooks/ceph.yml" - inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml" - - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=SetupReady - --timeout=60m - values: - - name: service-values - src_file: service-values.yaml - - name: edpm-nodeset-values-post-ceph - src_file: values.yaml - build_output: nodeset-post-ceph.yaml - - - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment - wait_conditions: - - >- - oc -n openstack wait - osdpns openstack-edpm --for condition=Ready - --timeout=60m - values: - - name: edpm-deployment-values-post-ceph - src_file: values.yaml - build_output: deployment-post-ceph.yaml diff --git a/automation/vars/hci.yaml b/automation/vars/hci.yaml new file mode 100644 index 000000000..7449b72b3 --- /dev/null +++ b/automation/vars/hci.yaml @@ -0,0 +1,78 @@ +--- +vas: + hci: + stages: + - path: examples/va/hci/control-plane/nncp + wait_conditions: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=5m + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/va/hci/control-plane + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=60m + values: + - name: service-values + src_file: service-values.yaml + - name: network-values + src_file: nncp/values.yaml + build_output: ../control-plane.yaml + + - path: examples/va/hci/edpm-pre-ceph/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=10m + values: + - name: edpm-nodeset-values + src_file: values.yaml + build_output: nodeset-pre-ceph.yaml + + - path: examples/va/hci/edpm-pre-ceph/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=30m + values: + - name: edpm-deployment-values + src_file: values.yaml + build_output: deployment-pre-ceph.yaml + post_stage_run: + - name: Deploy Ceph + type: playbook + source: "../../playbooks/ceph.yml" + inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml" + + - path: examples/va/hci + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=10m + values: + - name: service-values + src_file: service-values.yaml + - name: edpm-nodeset-values-post-ceph + src_file: values.yaml + build_output: nodeset-post-ceph.yaml + + - path: examples/va/hci/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=40m + values: + - name: edpm-deployment-values-post-ceph + src_file: values.yaml + build_output: deployment-post-ceph.yaml diff --git a/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml b/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml new file mode 100644 index 000000000..30bdcb021 --- /dev/null +++ b/automation/vars/nfv-ovs-dpdk-sriov-hci.yaml @@ -0,0 +1,78 @@ +--- +vas: + nfv-ovs-dpdk-sriov-hci: + stages: + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp + wait_conditions: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=5m + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=60m + values: + - name: service-values + src_file: service-values.yaml + - name: network-values + src_file: nncp/values.yaml + build_output: ../control-plane.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset-values + src_file: values.yaml + build_output: nodeset-pre-ceph.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/edpm-pre-ceph/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values + src_file: values.yaml + build_output: deployment-pre-ceph.yaml + post_stage_run: + - name: Deploy Ceph + type: playbook + source: "../../playbooks/ceph.yml" + inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml" + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: service-values + src_file: service-values.yaml + - name: edpm-nodeset-values-post-ceph + src_file: values.yaml + build_output: nodeset-post-ceph.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values-post-ceph + src_file: values.yaml + build_output: deployment-post-ceph.yaml diff --git a/automation/vars/ovs-dpdk-sriov.yaml b/automation/vars/ovs-dpdk-sriov.yaml new file mode 100644 index 000000000..64cefafbe --- /dev/null +++ b/automation/vars/ovs-dpdk-sriov.yaml @@ -0,0 +1,49 @@ +--- +vas: + ovs-dpdk-sriov: + stages: + - path: examples/va/nfv/ovs-dpdk-sriov/nncp + wait_conditions: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=60s + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/va/nfv/ovs-dpdk-sriov + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=1200s + values: + - name: network-values + src_file: nncp/values.yaml + - name: service-values + src_file: service-values.yaml + build_output: control-plane.yaml + + - path: examples/va/nfv/ovs-dpdk-sriov/edpm/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset-values + src_file: values.yaml + build_output: nodeset.yaml + + - path: examples/va/nfv/ovs-dpdk-sriov/edpm/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values + src_file: values.yaml + build_output: deployment.yaml diff --git a/automation/vars/ovs-dpdk.yaml b/automation/vars/ovs-dpdk.yaml new file mode 100644 index 000000000..bf680303d --- /dev/null +++ b/automation/vars/ovs-dpdk.yaml @@ -0,0 +1,49 @@ +--- +vas: + ovs-dpdk: + stages: + - path: examples/va/nfv/ovs-dpdk/nncp + wait_conditions: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=60s + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/va/nfv/ovs-dpdk + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=600s + values: + - name: network-values + src_file: nncp/values.yaml + - name: service-values + src_file: service-values.yaml + build_output: control-plane.yaml + + - path: examples/va/nfv/ovs-dpdk/edpm/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset-values + src_file: values.yaml + build_output: nodeset.yaml + + - path: examples/va/nfv/ovs-dpdk/edpm/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values + src_file: values.yaml + build_output: deployment.yaml diff --git a/automation/vars/sriov.yaml b/automation/vars/sriov.yaml new file mode 100644 index 000000000..f90fc33a5 --- /dev/null +++ b/automation/vars/sriov.yaml @@ -0,0 +1,49 @@ +--- +vas: + sriov: + stages: + - path: examples/va/nfv/sriov/nncp + wait_conditions: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=60s + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/va/nfv/sriov + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=600s + values: + - name: network-values + src_file: nncp/values.yaml + - name: service-values + src_file: service-values.yaml + build_output: control-plane.yaml + + - path: examples/va/nfv/sriov/edpm/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset-values + src_file: values.yaml + build_output: nodeset.yaml + + - path: examples/va/nfv/sriov/edpm/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values + src_file: values.yaml + build_output: deployment.yaml