Skip to content

Commit

Permalink
remove sap hana template (#435)
Browse files Browse the repository at this point in the history
  • Loading branch information
ksimon1 authored Apr 22, 2022
1 parent 139db7b commit a89b636
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 34 deletions.
28 changes: 1 addition & 27 deletions automation/test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ spec:
namespace: ${namespace}
EOF

apply_only=false
sizes=("tiny" "small" "medium" "large")
workloads=("desktop" "server" "highperformance")

Expand Down Expand Up @@ -104,27 +103,6 @@ delete_vm() {
while oc get -n $namespace vmi $vm_name 2> >(grep "not found"); do sleep $sample; done
}

only_apply_vm() {
vm_name=$1
template_path="dist/templates/$vm_name.yaml"
local template_option
running=false

set +e

if [ "${CLUSTERENV}" == "$ocenv" ]; then
local template_name=$(oc get -n ${namespace} -f ${template_path} -o=custom-columns=NAME:.metadata.name --no-headers -n kubevirt)
template_option=${template_name}
elif [ "${CLUSTERENV}" == "$k8senv" ]; then
template_option="-f ${template_path} --local"
fi

error=false
oc process ${template_option} -n $namespace -o json NAME=$vm_name SRC_PVC_NAME=$TARGET-datavolume-original SRC_PVC_NAMESPACE=kubevirt |
jq '.items[0].metadata.labels["vm.kubevirt.io/template.namespace"]="kubevirt"' |
oc apply -n $namespace -f -
}

run_vm() {
vm_name=$1
template_path="dist/templates/$vm_name.yaml"
Expand Down Expand Up @@ -177,10 +155,6 @@ run_vm() {
for size in ${sizes[@]}; do
for workload in ${workloads[@]}; do
vm_name=$template_name-$workload-$size
if [[ "${apply_only}" == "true" ]]; then
only_apply_vm $vm_name
else
run_vm $vm_name
fi
run_vm $vm_name
done
done
2 changes: 1 addition & 1 deletion automation/test_containerdisk_annotations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ver_label=$( \
dist/templates/fedora-server-large.yaml \
)

templates=(dist/templates/+(centos7|centos-stream|fedora|rhel8|rhel9)-!(saphana)-*.yaml)
templates=(dist/templates/+(centos7|centos-stream|fedora|rhel8|rhel9)-*.yaml)

for template in "${templates[@]}"; do
readarray -t template_oss < <( \
Expand Down
6 changes: 1 addition & 5 deletions automation/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ done

echo "Processing all templates to find syntax issues"
for template in $templates; do
if [[ $template =~ .*saphana.* ]]; then
oc process -f "$template" NAME=test WORKLOAD_NODE_LABEL_VALUE="somevalue" SRIOV_NETWORK_NAME1="default/sriov1" SRIOV_NETWORK_NAME2="default/sriov1" SRIOV_NETWORK_NAME3="default/sriov1"|| exit 1
else
oc process -f "$template" NAME=test DATA_SOURCE_NAME=test || exit 1
fi
oc process -f "$template" NAME=test DATA_SOURCE_NAME=test || exit 1
done

oc create -f dist/templates
Expand Down
1 change: 0 additions & 1 deletion templates/LABELS.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ identifiers](https://gitlab.com/libosinfo/osinfo-db/tree/master/data/os) from th
- workload.template.kubevirt.io/desktop
- workload.template.kubevirt.io/server
- workload.template.kubevirt.io/highperformance
- workload.template.kubevirt.io/saphana

## Flavors

Expand Down

0 comments on commit a89b636

Please sign in to comment.