diff --git a/tools/document/validate_site_docs.sh b/tools/document/validate_site_docs.sh index e5d5ed779..cb9eeedd8 100755 --- a/tools/document/validate_site_docs.sh +++ b/tools/document/validate_site_docs.sh @@ -19,13 +19,14 @@ set -xe : ${MANIFEST_ROOT:="$(basename "${PWD}")/manifests"} # The location of sites whose manifests should be validated. # This are relative to MANIFEST_ROOT above -: ${SITE_ROOT:="$(basename "${PWD}")/manifests/site"} +: ${MANIFEST_PATH:="manifests/site"} +: ${SITE_ROOT:="$(basename "${PWD}")/${MANIFEST_PATH}"} : ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/airshipctl"} : ${SITE:="test-workload"} : ${CONTEXT:="kind-airship"} : ${AIRSHIPKUBECONFIG:="${HOME}/.airship/kubeconfig"} : ${AIRSHIPKUBECONFIG_BACKUP:="${AIRSHIPKUBECONFIG}-backup"} - +: ${TOOLS_PATH:="${MANIFEST_ROOT}/airshipctl/tools"} : ${KUBECTL:="/usr/local/bin/kubectl"} TMP=$(mktemp -d) @@ -76,7 +77,7 @@ manifests: tag: "" url: ${MANIFEST_REPO_URL} targetPath: ${MANIFEST_ROOT} - metadataPath: manifests/site/${SITE}/metadata.yaml + metadataPath: ${MANIFEST_PATH}/${SITE}/metadata.yaml EOL } @@ -113,7 +114,7 @@ for plan in $phase_plans; do export CLUSTER="${cluster}" # Start a fresh, empty kind cluster for validating documents - ./tools/document/start_kind.sh + ${TOOLS_PATH}/document/start_kind.sh generate_airshipconf ${cluster} diff --git a/tools/validate_docs b/tools/validate_docs index 1602739b4..2b1636856 100755 --- a/tools/validate_docs +++ b/tools/validate_docs @@ -21,11 +21,14 @@ set -xe : ${MANIFEST_ROOT:="$(dirname "${PWD}")"} # The space-separated locations of sites whose manifests should be validated. # These are relative to MANIFEST_ROOT above -: ${SITE_ROOTS:="$(basename "${PWD}")/manifests/site"} +: ${MANIFEST_PATH:="manifests/site"} +: ${SITE_ROOTS:="$(basename "${PWD}")/${MANIFEST_PATH}"} +: ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/airshipctl"} +: ${TOOLS_PATH:="${MANIFEST_ROOT}/airshipctl/tools"} # get kind echo "Fetching kind from ${KIND_URL}..." -TMP=$(KIND_URL=${KIND_URL} ./tools/document/get_kind.sh) +TMP=$(KIND_URL=${KIND_URL} ${TOOLS_PATH}/document/get_kind.sh) export KIND=${TMP}/kind export KUBECTL_URL @@ -38,7 +41,9 @@ for site_root in ${SITE_ROOTS}; do fi echo -e "\nValidating site: ${MANIFEST_ROOT}/${site_root}/${site}\n****************" MANIFEST_ROOT=${MANIFEST_ROOT} SITE_ROOT=${site_root} SITE=${site} \ - ./tools/document/validate_site_docs.sh + MANIFEST_REPO_URL=${MANIFEST_REPO_URL} MANIFEST_PATH=${MANIFEST_PATH} MANIFEST_REPO_URL=${MANIFEST_REPO_URL} \ + TOOLS_PATH=${TOOLS_PATH} \ + ${TOOLS_PATH}/document/validate_site_docs.sh echo "Validation of site ${site} is successful!" done done