From 4258d1904e6e1975ed078844a2df3d1d7b754bec Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Thu, 3 Dec 2020 19:24:37 -0600 Subject: [PATCH] Add missing metadata.yaml definitions Some of sites defined in document model have no metadata.yaml, which is essential to work properly with that sites. * az-test-site and gcp-test-site metadata.yaml added * metadata.yaml for test-site moved to appropriate directory for consistency Change-Id: Ibec109e41a5e3fd36794dc6a879888cfc610c9cc Signed-off-by: Ruslan Aliev Relates-To: #19 --- manifests/site/az-test-site/metadata.yaml | 3 +++ manifests/site/gcp-test-site/metadata.yaml | 3 +++ manifests/{ => site/test-site}/metadata.yaml | 0 tools/deployment/22_test_configs.sh | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 manifests/site/az-test-site/metadata.yaml create mode 100644 manifests/site/gcp-test-site/metadata.yaml rename manifests/{ => site/test-site}/metadata.yaml (100%) diff --git a/manifests/site/az-test-site/metadata.yaml b/manifests/site/az-test-site/metadata.yaml new file mode 100644 index 000000000..7d99fd5f9 --- /dev/null +++ b/manifests/site/az-test-site/metadata.yaml @@ -0,0 +1,3 @@ +phase: + path: manifests/site/az-test-site/phases + docEntryPointPrefix: manifests/site/az-test-site diff --git a/manifests/site/gcp-test-site/metadata.yaml b/manifests/site/gcp-test-site/metadata.yaml new file mode 100644 index 000000000..38f0544f5 --- /dev/null +++ b/manifests/site/gcp-test-site/metadata.yaml @@ -0,0 +1,3 @@ +phase: + path: manifests/site/gcp-test-site/phases + docEntryPointPrefix: manifests/site/gcp-test-site diff --git a/manifests/metadata.yaml b/manifests/site/test-site/metadata.yaml similarity index 100% rename from manifests/metadata.yaml rename to manifests/site/test-site/metadata.yaml diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 7f6495932..2fbfe08f3 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -30,7 +30,7 @@ export REMOTE_PROXY=false export AIRSHIP_CONFIG_ISO_SERVE_HOST=${HOST:-"localhost"} export AIRSHIP_CONFIG_ISO_PORT=${SERVE_PORT} export AIRSHIP_CONFIG_ISO_NAME=${ISO_NAME:-"ubuntu-focal.iso"} -export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"manifests/metadata.yaml"} +export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"manifests/site/test-site/metadata.yaml"} export SYSTEM_ACTION_RETRIES=30 export SYSTEM_REBOOT_DELAY=30 export AIRSHIP_CONFIG_PHASE_REPO_BRANCH=${BRANCH:-"master"}