diff options
Diffstat (limited to 'jjb/scripts')
-rw-r--r-- | jjb/scripts/hicn/docs.sh | 8 | ||||
-rwxr-xr-x | jjb/scripts/publish_docs.sh | 48 | ||||
-rw-r--r-- | jjb/scripts/terraform_s3_docs_ship.sh | 3 |
3 files changed, 36 insertions, 23 deletions
diff --git a/jjb/scripts/hicn/docs.sh b/jjb/scripts/hicn/docs.sh index 46e835082..e927f0bbc 100644 --- a/jjb/scripts/hicn/docs.sh +++ b/jjb/scripts/hicn/docs.sh @@ -9,8 +9,6 @@ echo "---> jjb/scripts/hicn/docs.sh" bash scripts/build-packages.sh sphinx -if [[ "${JOB_NAME}" == *merge* ]]; then - mkdir -p "${SITE_DIR_ROOT}" - mv -f "${DOC_DIR}" "${SITE_DIR}" - find "${SITE_DIR}" -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete -fi +mkdir -p "${SITE_DIR_ROOT}" +mv -f "${DOC_DIR}" "${SITE_DIR}" +find "${SITE_DIR}" -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete diff --git a/jjb/scripts/publish_docs.sh b/jjb/scripts/publish_docs.sh index 891e57a7b..1cf01a4bb 100755 --- a/jjb/scripts/publish_docs.sh +++ b/jjb/scripts/publish_docs.sh @@ -17,12 +17,8 @@ echo "---> publish_docs.sh" set -exuo pipefail -if [[ "${SILO}" != "production" ]] ; then - echo "WARNING: Doc upload not supported on Jenkins '${SILO}'..." - exit 0 -fi - CDN_URL="s3-docs.fd.io" +bucket="fdio-docs-s3-cloudfront-index" if [[ ${JOB_NAME} == *merge* ]]; then case "${JOB_NAME}" in @@ -51,17 +47,37 @@ if [[ ${JOB_NAME} == *merge* ]]; then *) die "Unknown job: ${JOB_NAME}" esac +elif [[ ${JOB_NAME} == *verify* ]]; then + bucket="vpp-docs-7day-retention" + # Use the same bucket path as logs so that the docs can be viewed by + # s/s3-logs/s3-docs-7day/ in the URL after selecting the logs URL from + # the jenkins job page. + bucket_path="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/" + case "${JOB_NAME}" in + *"hicn-docs"*) + workspace_dir="${WORKSPACE}/build/doc/deploy-site" + ;; + *"vpp-docs"*) + CDN_URL="s3-docs-7day.fd.io" + workspace_dir="${WORKSPACE}/build-root/docs/html" + ;; + *) + die "Unknown job: ${JOB_NAME}" + esac +else + die "Unknown job: ${JOB_NAME}" +fi - export TF_VAR_workspace_dir=$workspace_dir - export TF_VAR_bucket_path=$bucket_path - export AWS_SHARED_CREDENTIALS_FILE=$HOME/.aws/credentials - export AWS_DEFAULT_REGION="us-east-1" +export TF_VAR_workspace_dir="$workspace_dir" +export TF_VAR_bucket_path="$bucket_path" +export TF_VAR_bucket="$bucket" +export AWS_SHARED_CREDENTIALS_FILE=$HOME/.aws/credentials +export AWS_DEFAULT_REGION="us-east-1" - echo "INFO: archiving docs to S3" - pushd .. - terraform init -no-color - terraform apply -no-color -auto-approve - popd +echo "INFO: archiving docs to S3 bucket '$bucket'" +pushd .. +terraform init -no-color +terraform apply -no-color -auto-approve +popd - echo "S3 docs: <a href=\"https://${CDN_URL}${bucket_path}\">https://${CDN_URL}${bucket_path}</a>" -fi +echo "S3 docs: <a href=\"https://${CDN_URL}${bucket_path}\">https://${CDN_URL}${bucket_path}</a>" diff --git a/jjb/scripts/terraform_s3_docs_ship.sh b/jjb/scripts/terraform_s3_docs_ship.sh index 5989e3e9a..de177d35c 100644 --- a/jjb/scripts/terraform_s3_docs_ship.sh +++ b/jjb/scripts/terraform_s3_docs_ship.sh @@ -21,7 +21,7 @@ cat >"/w/workspace/main.tf" <<'END_OF_TERRAFORM_SCRIPT' provider "aws" { region = "us-east-1" profile = "default" - s3_force_path_style = false + s3_use_path_style = false skip_credentials_validation = true skip_metadata_api_check = true skip_requesting_account_id = true @@ -65,7 +65,6 @@ variable "file_match_pattern" { variable "bucket" { description = "S3 bucket name" type = string - default = "fdio-docs-s3-cloudfront-index" } variable "bucket_path" { |