mirror of
https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git
synced 2025-12-15 11:22:43 +03:00
* fix tests?
This commit is contained in:
Jake Buchholz Göktürk
parent
9a00dd686d
commit
6b87f633f2
@ -68,7 +68,6 @@ init__install_hotplugs() {
|
||||
. "$LIBDIR/tiny-cloud/$HOTPLUG_TYPE"
|
||||
fi
|
||||
|
||||
printf ': ' >&2
|
||||
for module in $HOTPLUG_MODULES; do
|
||||
result='unknown'
|
||||
level='err'
|
||||
@ -296,6 +295,4 @@ userdata_type() {
|
||||
USERDATA_TYPE="$(userdata_type)"
|
||||
if [ -f "$LIBDIR/tiny-cloud/user-data/$USERDATA_TYPE" ]; then
|
||||
. "$LIBDIR/tiny-cloud/user-data/$USERDATA_TYPE"
|
||||
else
|
||||
log -i warn "no user-data handler found for '$USERDATA_TYPE'"
|
||||
fi
|
||||
|
||||
@ -112,7 +112,7 @@ for ACTION in $INIT_ACTIONS; do
|
||||
RESULT="done"
|
||||
LEVEL="info"
|
||||
else
|
||||
RESULT="FAIL"
|
||||
RESULT="failed"
|
||||
fi
|
||||
fi
|
||||
printf ' ++ ' >&2
|
||||
|
||||
@ -49,7 +49,7 @@ expand_root_partition_body() {
|
||||
|
||||
install_hotplugs_fail_body() {
|
||||
CLOUD=aws atf_check -s not-exit:0 \
|
||||
-e match:"vnic_eth_hotplug\(!\)" \
|
||||
-e match:"vnic_eth_hotplug: failed" \
|
||||
sh -c ". $lib; HOTPLUG_MODULES='vnic_eth_hotplug'; init__install_hotplugs"
|
||||
}
|
||||
|
||||
|
||||
@ -30,6 +30,11 @@ userdata_type_body() {
|
||||
-o match:"unknown" \
|
||||
sh -c ". \"$lib\"; userdata_type"
|
||||
|
||||
echo "#alpine-config" > var/lib/cloud/user-data
|
||||
CLOUD="$c" atf_check \
|
||||
-o match:"alpine-config" \
|
||||
sh -c ". \"$lib\"; userdata_type"
|
||||
|
||||
echo "#!/bin/sh" > var/lib/cloud/user-data
|
||||
CLOUD="$c" atf_check -s exit:0 \
|
||||
-o match:"script" \
|
||||
|
||||
@ -64,7 +64,7 @@ set_network_config_auto_body() {
|
||||
|
||||
atf_check \
|
||||
-o match:"rc-update" \
|
||||
-e match:"set_network_interfaces .*DONE" \
|
||||
-e match:"set_network_interfaces: done" \
|
||||
tiny-cloud early
|
||||
atf_check \
|
||||
-o match:"auto eth1" \
|
||||
@ -86,7 +86,7 @@ userdata_bootcmd_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_bootcmd .*DONE" \
|
||||
-e match:"userdata_bootcmd: done" \
|
||||
-o match:"^foo$" -o match:"^bar$" \
|
||||
tiny-cloud main
|
||||
}
|
||||
@ -99,7 +99,7 @@ userdata_ntp_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_ntp .*DONE" \
|
||||
-e match:"userdata_ntp: done" \
|
||||
-o match:"apk add.*chrony" \
|
||||
-o match:"rc-update .*chronyd" \
|
||||
-o match:"rc-service .*chronyd" \
|
||||
@ -115,7 +115,7 @@ userdata_ntp_busybox_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_ntp .*DONE" \
|
||||
-e match:"userdata_ntp: done" \
|
||||
-o not-match:"apk add" \
|
||||
-o match:"rc-update .*ntpd" \
|
||||
-o match:"rc-service .*ntpd" \
|
||||
@ -131,7 +131,7 @@ userdata_ntp_openntpd_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_ntp .*DONE" \
|
||||
-e match:"userdata_ntp: done" \
|
||||
-o match:"apk add.*openntpd" \
|
||||
-o match:"rc-update .*openntpd" \
|
||||
-o match:"rc-service .*openntpd" \
|
||||
@ -146,7 +146,7 @@ userdata_apk_cache_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_apk_cache .*DONE" \
|
||||
-e match:"userdata_apk_cache: done" \
|
||||
-o ignore \
|
||||
tiny-cloud main
|
||||
atf_check -o match:"$PWD/var/cache/apk" readlink -f etc/apk/cache
|
||||
@ -162,7 +162,7 @@ userdata_apk_repositories_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_apk_repositories .*DONE" \
|
||||
-e match:"userdata_apk_repositories: done" \
|
||||
-o ignore \
|
||||
tiny-cloud main
|
||||
atf_check -o match:"^/srv/packages/main$" \
|
||||
@ -181,7 +181,7 @@ userdata_apk_repositories_version_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_apk_repositories .*DONE" \
|
||||
-e match:"userdata_apk_repositories: done" \
|
||||
-o ignore \
|
||||
tiny-cloud main
|
||||
atf_check -o match:"^https://cdn.alpinelinux.org/edge/main$" \
|
||||
@ -202,7 +202,7 @@ userdata_apk_repositories_version_auto_edge_body() {
|
||||
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_apk_repositories .*DONE" \
|
||||
-e match:"userdata_apk_repositories: done" \
|
||||
-o ignore \
|
||||
tiny-cloud main
|
||||
atf_check -o match:"^https://cdn.alpinelinux.org/edge/main$" \
|
||||
@ -219,7 +219,7 @@ userdata_packages_body() {
|
||||
EOF
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_packages .*DONE" \
|
||||
-e match:"userdata_packages: done" \
|
||||
-o match:"apk add .*tmux" \
|
||||
-o match:"apk add .*vim" \
|
||||
tiny-cloud main
|
||||
@ -235,7 +235,7 @@ userdata_runcmd_body() {
|
||||
# run net phase to extract the user data
|
||||
atf_check -e ignore -o ignore tiny-cloud net
|
||||
atf_check \
|
||||
-e match:"userdata_runcmd .*DONE" \
|
||||
-e match:"userdata_runcmd: done" \
|
||||
-o match:"^foo$" -o match:"^bar$" \
|
||||
tiny-cloud final
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ no_metadata_early_body() {
|
||||
fake_netcat
|
||||
for provider in $PROVIDERS; do
|
||||
CLOUD="$provider" atf_check \
|
||||
-e not-match:"UNKNOWN" \
|
||||
-e not-match:"unknown" \
|
||||
-e not-match:"not found" \
|
||||
-e not-match:"o such file" \
|
||||
-o match:"rc-update add.*sshd" \
|
||||
@ -41,8 +41,8 @@ no_userdata_net_body() {
|
||||
fake_netcat
|
||||
for provider in $PROVIDERS; do
|
||||
CLOUD="$provider" atf_check \
|
||||
-e not-match:"UNKNOWN" \
|
||||
-e match:"save_userdata.*DONE" \
|
||||
-e not-match:"unknown" \
|
||||
-e match:"save_userdata.*done" \
|
||||
tiny-cloud net
|
||||
done
|
||||
}
|
||||
@ -53,7 +53,7 @@ no_userdata_main_body() {
|
||||
# we should not set empty hostname
|
||||
# we should not create .ssh dir for non-existing user
|
||||
CLOUD="$provider" atf_check \
|
||||
-e not-match:"UNKNOWN" \
|
||||
-e not-match:"unknown" \
|
||||
-o not-match:"hostname.*-F" \
|
||||
-o not-match:"chown.*/\.ssh" \
|
||||
tiny-cloud main
|
||||
@ -69,11 +69,11 @@ no_userdata_final_body() {
|
||||
fake_netcat
|
||||
for provider in $PROVIDERS; do
|
||||
CLOUD="$provider" atf_check \
|
||||
-e not-match:"UNKNOWN" \
|
||||
-e match:"bootstrap_complete .*" \
|
||||
-e not-match:"unknown" \
|
||||
-e match:"bootstrap marked complete \
|
||||
tiny-cloud final
|
||||
CLOUD="$provider" atf_check \
|
||||
-e match:"bootstrap marked.*incomplete" \
|
||||
-e match:"bootstrap marked incomplete" \
|
||||
tiny-cloud --bootstrap incomplete
|
||||
done
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user