Skip to content

Commit 75ab522

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "[CI] Use smaller flavor for CI"
2 parents b5100aa + d1a4d72 commit 75ab522

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

tests/test-container-engine-migration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function create_instance {
1919
server_create_extra="${server_create_extra} --config-drive True"
2020
fi
2121

22-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
22+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
2323
# If the status is not ACTIVE, print info and exit 1
2424
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
2525
echo "FAILED: Instance is not active"

tests/test-core-openstack.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function create_instance {
167167
server_create_extra="${server_create_extra} --config-drive True"
168168
fi
169169

170-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
170+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
171171
# If the status is not ACTIVE, print info and exit 1
172172
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
173173
echo "FAILED: Instance is not active"
@@ -179,7 +179,7 @@ function create_instance {
179179
function resize_instance {
180180
local name=$1
181181

182-
openstack server resize --flavor m2.tiny --wait ${name}
182+
openstack server resize --flavor c2.tiny --wait ${name}
183183
# If the status is not VERIFY_RESIZE, print info and exit 1
184184
if [[ $(openstack server show ${name} -f value -c status) != "VERIFY_RESIZE" ]]; then
185185
echo "FAILED: Instance is not resized"
@@ -439,7 +439,7 @@ function test_internal_dns_integration {
439439
SERVER_NAME="my_vm"
440440
SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
441441

442-
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
442+
openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
443443

444444
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
445445
attempt=0

tests/test-magnum.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function test_designate {
5858
openstack router set --external-gateway public1 router-dns-test
5959
openstack router add subnet router-dns-test tenant-dns-test
6060

61-
openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
61+
openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test ${SERVER_NAME}
6262

6363
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
6464
attempt=0
@@ -131,7 +131,7 @@ EOF
131131

132132
DNS_DOMAIN="fixed.sink.example.org."
133133
SERVER_NAME="sink-server"
134-
openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
134+
openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test ${SERVER_NAME}
135135

136136
check_if_resolvable "${DNS_DOMAIN}" "${SERVER_NAME}.${DNS_DOMAIN}" "A"
137137

tests/test-octavia.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function test_octavia {
3030
# Create a Loadblanacer
3131
openstack loadbalancer create --name lb --vip-subnet-id demo-subnet --wait
3232
# Create a server to act as a backend.
33-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
33+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
3434
member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
3535
openstack server add floating ip lb_member ${member_fip}
3636
member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)
@@ -132,7 +132,7 @@ function test_internal_dns_integration {
132132
SERVER_NAME="my_vm"
133133
SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
134134

135-
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
135+
openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
136136

137137
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
138138
attempt=0

tests/test-ovn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function test_octavia {
4747
openstack loadbalancer list
4848

4949
# Create a server to act as a backend
50-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
50+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
5151
member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
5252
openstack server add floating ip lb_member ${member_fip}
5353
member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)

0 commit comments

Comments
 (0)