Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions tests/e2e/cloudprovider/test-lb-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function _check_lb_tags {
local tags=$3

if [ -z "$tags" ]; then
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
fi
if [[ ! "$tags" =~ (^|[[:space:]])kube_service_(.+?)$svcName($|[[:space:]]) ]]; then
Expand Down Expand Up @@ -468,7 +468,7 @@ EOF
lbID=$(_check_service_lb_annotation "${service1}")

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -509,7 +509,7 @@ EOF
fi

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -560,7 +560,7 @@ EOF
wait_for_loadbalancer $lbID

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -605,7 +605,7 @@ EOF
wait_for_service_address ${service3}

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service3 "$tags"
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -637,7 +637,7 @@ EOF
sleep 10

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand All @@ -660,7 +660,7 @@ EOF
sleep 5

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand All @@ -680,7 +680,7 @@ EOF
wait_for_loadbalancer $lbID

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -eq 0 ]; then
Expand Down Expand Up @@ -778,7 +778,7 @@ EOF
lbID=$(_check_service_lb_annotation "${service1}")

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -ne 0 ]; then
Expand All @@ -792,7 +792,7 @@ EOF
wait_for_service_deleted ${service1}

printf "\n>>>>>>> Validating tags of openstack load balancer %s \n" "$lbID"
tags=$(openstack loadbalancer show $lbID -f value -c tags)
tags=$(openstack loadbalancer show $lbID -f json -c tags | jq -r '.tags[]')
tags=$(echo $tags)
_check_lb_tags $lbID $service1 "$tags"
if [ $? -eq 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/playbooks/roles/install-devstack/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
user: "stack"
workdir: "/home/{{ user }}/devstack"
branch: "stable/2025.1"
branch: "stable/2025.2"
enable_services:
- nova
- glance
Expand Down