al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2026-02-04 04:22:43 +03:00
Code Packages Wiki

Move alpine provider into nocloud

Browse Source
This commit is contained in:
Natanael Copa 2024-06-23 20:26:22 +00:00 committed by Jake Buchholz Göktürk
parent e402fe63e7
commit 239cb59a13
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tiny-cloud/cloud/alpine/imds
View File

@ -1 +0,0 @@
../nocloud/imds

0
lib/tiny-cloud/cloud/alpine/init → lib/tiny-cloud/cloud/nocloud/init
View File

5
lib/tiny-cloud/init
View File

@ -295,6 +295,11 @@ init__set_ssh_keys() {
### load cloud-specific init functions / vars (potentially overriding) ### load cloud-specific init functions / vars (potentially overriding)
if [ "$CLOUD" = "alpine" ]; then
log -i -t "$phase" warn "CLOUD provider alpine is deprecated. Use nocloud"
CLOUD="nocloud"
fi
if [ -f "$LIBDIR/tiny-cloud/cloud/$CLOUD/init" ]; then if [ -f "$LIBDIR/tiny-cloud/cloud/$CLOUD/init" ]; then
. "$LIBDIR/tiny-cloud/cloud/$CLOUD/init" . "$LIBDIR/tiny-cloud/cloud/$CLOUD/init"
fi fi

8
tests/imds.test
View File

@ -5,13 +5,12 @@
. $(atf_get_srcdir)/test_env.sh . $(atf_get_srcdir)/test_env.sh
export PREFIX="$srcdir" export PREFIX="$srcdir"
PROVIDERS="alpine aws azure gcp nocloud scaleway" PROVIDERS="aws azure gcp nocloud scaleway"
init_tests \ init_tests \
imds_help \ imds_help \
imds_space \ imds_space \
\ \
imds_hostname_alpine \
imds_hostname_aws \ imds_hostname_aws \
imds_hostname_azure \ imds_hostname_azure \
imds_hostname_gcp \ imds_hostname_gcp \
@ -20,7 +19,6 @@ init_tests \
imds_hostname_scaleway \ imds_hostname_scaleway \
imds_hostname_hetzner \ imds_hostname_hetzner \
\ \
imds_local_hostname_alpine \
imds_local_hostname_aws \ imds_local_hostname_aws \
imds_local_hostname_azure \ imds_local_hostname_azure \
imds_local_hostname_gcp \ imds_local_hostname_gcp \
@ -29,7 +27,6 @@ init_tests \
imds_local_hostname_scaleway \ imds_local_hostname_scaleway \
imds_local_hostname_hetzner \ imds_local_hostname_hetzner \
\ \
imds_ssh_keys_alpine \
imds_ssh_keys_aws \ imds_ssh_keys_aws \
imds_ssh_keys_azure \ imds_ssh_keys_azure \
imds_ssh_keys_gcp \ imds_ssh_keys_gcp \
@ -68,7 +65,6 @@ check_hostname() {
EOF EOF
CLOUD="$1" atf_check -o match:"myhostname" imds @hostname CLOUD="$1" atf_check -o match:"myhostname" imds @hostname
} }
imds_hostname_alpine_body() { check_hostname alpine; }
imds_hostname_aws_body() { check_hostname aws; } imds_hostname_aws_body() { check_hostname aws; }
imds_hostname_azure_body() { check_hostname azure; } imds_hostname_azure_body() { check_hostname azure; }
imds_hostname_gcp_body() { check_hostname gcp; } imds_hostname_gcp_body() { check_hostname gcp; }
@ -97,7 +93,6 @@ check_local_hostname() {
EOF EOF
CLOUD="$1" atf_check -o match:"myhostname" imds @local-hostname CLOUD="$1" atf_check -o match:"myhostname" imds @local-hostname
} }
imds_local_hostname_alpine_body() { check_local_hostname alpine; }
imds_local_hostname_aws_body() { check_local_hostname aws; } imds_local_hostname_aws_body() { check_local_hostname aws; }
imds_local_hostname_azure_body() { check_local_hostname azure; } imds_local_hostname_azure_body() { check_local_hostname azure; }
imds_local_hostname_gcp_body() { check_local_hostname gcp; } imds_local_hostname_gcp_body() { check_local_hostname gcp; }
@ -135,7 +130,6 @@ check_ssh_keys() {
EOF EOF
CLOUD="$1" atf_check -o match:"$key" imds @ssh-keys CLOUD="$1" atf_check -o match:"$key" imds @ssh-keys
} }
imds_ssh_keys_alpine_body() { check_ssh_keys alpine; }
imds_ssh_keys_aws_body() { check_ssh_keys aws; } imds_ssh_keys_aws_body() { check_ssh_keys aws; }
imds_ssh_keys_azure_body() { check_ssh_keys azure; } imds_ssh_keys_azure_body() { check_ssh_keys azure; }
imds_ssh_keys_gcp_body() { check_ssh_keys gcp; } imds_ssh_keys_gcp_body() { check_ssh_keys gcp; }

2
tests/init.test
View File

@ -25,7 +25,7 @@ init_tests \
userdata_type \ userdata_type \
run_userdata run_userdata
PROVIDERS="alpine aws azure gcp nocloud oci scaleway hetzner" PROVIDERS="aws azure gcp nocloud oci scaleway hetzner"
expand_root_body() { expand_root_body() {
mkdir proc mkdir proc

3
tests/tiny-cloud-alpine.test
View File

@ -6,8 +6,7 @@
export PREFIX="$srcdir" export PREFIX="$srcdir"
export MOCK=echo export MOCK=echo
export CLOUD=alpine export CLOUD=nocloud
lib="$srcdir"/lib/tiny-cloud/cloud/alpine/init
init_tests \ init_tests \
set_ephemeral_network_cmdline \ set_ephemeral_network_cmdline \