update report tar location var

stages/publish/plugin_repo_map_vars.sh

@@ -13,6 +13,7 @@ export plugin_path="${REGISTRY_URL}/${PLUGIN_NAME}:${PLUGIN_VERSION}"
 export plugin_url="${S3_HTML_LINK}/${REMOTE_REPORT_DIRECTORY}/${PLUGIN_NAME}_plugin_scan_result.tar.gz"
 
 export tar_location="${S3_HTML_LINK}/${REMOTE_REPORT_DIRECTORY}/${REPORT_TAR_NAME}"
+export TAR_ARTIFACT="${DOCUMENTATION_DIRECTORY}/${REPORT_TAR_NAME}"
 
 export anchore_security_results="${S3_HTML_LINK}/${REMOTE_REPORT_DIRECTORY}/csvs/anchore_security.csv"
 

stages/publish/upload-to-s3-run.sh

@@ -17,8 +17,6 @@ PROJECT_PATH=$(echo "${CI_PROJECT_PATH}" | sed -e 's/.*ironbank-plugins\/\(.*\)/
 # Files are guaranteed to exist by the preflight checks
 PROJECT_README="README.md"
 
-report_tar_path="$(ls ${DOCUMENTATION_DIRECTORY}/*.tar.gz)"
-
 source "${PIPELINE_REPO_DIR}"/stages/publish/plugin_repo_map_vars.sh
 
 python3 "${PIPELINE_REPO_DIR}"/stages/publish/create_repo_map.py --target ${BASE_BUCKET_DIRECTORY}/"${PROJECT_PATH}"/repo_map.json

stages/publish/upload_to_s3.yaml

@@ -4,7 +4,7 @@ upload to s3:
   variables:
     #TODO: Put these in globals
     SCAN_DIRECTORY: "${ARTIFACT_STORAGE}/scan-results"
-    DOCUMENTATION_DIRECTORY: "${ARTIFACT_STORAGE}/report-generation"
+    DOCUMENTATION_DIRECTORY: "${ARTIFACT_STORAGE}/report-generation/reports"
     BUILD_DIRECTORY: "${ARTIFACT_STORAGE}/build"
     BASE_BUCKET_DIRECTORY: testing/plugins-scan-reports
     REPORT_TAR_NAME: "${PLUGIN_NAME}-${REPORT_DATE}_plugin_scan_result.tar.gz"