diff options
Diffstat (limited to 'kud')
| -rw-r--r-- | kud/deployment_infra/playbooks/configure-optane.yml | 2 | ||||
| -rw-r--r-- | kud/deployment_infra/playbooks/preconfigure-optane.yml | 16 | ||||
| -rwxr-xr-x | kud/tests/emco.sh | 2 | ||||
| -rwxr-xr-x | kud/tests/plugin_fw.sh | 4 | ||||
| -rwxr-xr-x | kud/tests/topology-manager.sh | 5 |
5 files changed, 14 insertions, 15 deletions
diff --git a/kud/deployment_infra/playbooks/configure-optane.yml b/kud/deployment_infra/playbooks/configure-optane.yml index 8e000aa4..01189808 100644 --- a/kud/deployment_infra/playbooks/configure-optane.yml +++ b/kud/deployment_infra/playbooks/configure-optane.yml @@ -12,4 +12,4 @@ - hosts: localhost tasks: - name: Apply Optane PMEM CSI Daemonset - command: "{{ base_dest }}/optane/deploy_optane.sh" + command: "{{ optane_dest }}/deploy_optane.sh" diff --git a/kud/deployment_infra/playbooks/preconfigure-optane.yml b/kud/deployment_infra/playbooks/preconfigure-optane.yml index 64622895..135371ea 100644 --- a/kud/deployment_infra/playbooks/preconfigure-optane.yml +++ b/kud/deployment_infra/playbooks/preconfigure-optane.yml @@ -22,6 +22,14 @@ state: directory path: "{{ optane_dest }}" ignore_errors: yes + - copy: + src: "{{ playbook_dir }}/deploy_optane.sh" + dest: "{{ optane_dest }}" + - name: Changing perm of "sh", adding "+x" + shell: "chmod +x deploy_optane.sh" + args: + chdir: "{{ optane_dest }}" + warn: False - hosts: kube-node become: yes @@ -61,14 +69,6 @@ chdir: "optane" warn: False - copy: - src: "{{ playbook_dir }}/deploy_optane.sh" - dest: optane - - name: Changing perm of "sh", adding "+x" - shell: "chmod +x deploy_optane.sh" - args: - chdir: "optane" - warn: False - - copy: src: "{{ playbook_dir }}/../images/pmem-csi-lvm.yaml" dest: optane - copy: diff --git a/kud/tests/emco.sh b/kud/tests/emco.sh index 8b459b97..2b8eab1e 100755 --- a/kud/tests/emco.sh +++ b/kud/tests/emco.sh @@ -424,7 +424,7 @@ function deleteOrchestratorData { delete_resource "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}" - delete_resource "${base_url_orchestrator}/projects/${projectname}" + delete_resource_nox "${base_url_orchestrator}/projects/${projectname}" print_msg "deleteOrchestratorData done" } diff --git a/kud/tests/plugin_fw.sh b/kud/tests/plugin_fw.sh index a503d661..de9c12e2 100755 --- a/kud/tests/plugin_fw.sh +++ b/kud/tests/plugin_fw.sh @@ -124,9 +124,9 @@ print_msg "Retrieving VNF details" response="$(call_api "${base_url}/instance/${vnf_id}")" echo "$response" print_msg "Assert additional label has been assigned to rb instance" -test "$(jq -r .request.labels.testCaseName <<< "${response}")" == plugin_fw.sh +test "$(jq -r '.request.labels.testCaseName' <<< "${response}")" == plugin_fw.sh print_msg "Assert ReleaseName has been correctly overriden" -test "$(jq -r .request.release-name <<< "${response}")" == "${release_name}" +test "$(jq -r '.request."release-name"' <<< "${response}")" == "${release_name}" #Teardown print_msg "Deleting VNF Instance" diff --git a/kud/tests/topology-manager.sh b/kud/tests/topology-manager.sh index bbffd4d7..7d434386 100755 --- a/kud/tests/topology-manager.sh +++ b/kud/tests/topology-manager.sh @@ -15,9 +15,8 @@ set -o pipefail source _common.sh source _functions.sh -ethernet_adpator_version=$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 ) -if [ -z "$ethernet_adpator_version" ]; then - echo " Ethernet adapator version is not set. Topology manager test case cannot run on this machine" +if [ -z "$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 )" ]; then + echo "Ethernet adaptor version is not set. Topology manager test case cannot run on this machine" exit 0 else echo "NIC card specs match. Topology manager option avaiable for this version." |