From bebdc3f89eee3e728b1aae1a5a0aa03cc9ade24a Mon Sep 17 00:00:00 2001 From: Kevin Ortega Date: Thu, 28 Mar 2024 12:06:34 -0400 Subject: [PATCH] Update cd_finish --- pipeline/cd_finish | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pipeline/cd_finish b/pipeline/cd_finish index 20f9e7c..f3c48d4 100755 --- a/pipeline/cd_finish +++ b/pipeline/cd_finish @@ -11,7 +11,7 @@ fi export WORKSPACE -. "${ONE_PIPELINE_PATH}"/pipeline/variables_config +. "${ONE_PIPELINE_PATH}"/internal/pipeline/variables_config . "${ONE_PIPELINE_PATH}"/tools/retry cd "$WORKSPACE" @@ -31,15 +31,15 @@ GHE_REPO=${INVENTORY_REPO##*/} curl -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $(get_env git-token)" https://github.ibm.com/api/v3/repos/${GHE_ORG}/${GHE_REPO}/releases -d "{\"tag_name\": \"$(get_env version)\",\"name\": \"$(get_env version)\",\"draft\": false,\"prerelease\": false}" set_env ibmcloud-api "cloud.ibm.com" -. "${ONE_PIPELINE_PATH}"/security-compliance/scan +. "${ONE_PIPELINE_PATH}"/internal/security-compliance/scan -. "${ONE_PIPELINE_PATH}"/doi/publish_acceptance_tests +. "${ONE_PIPELINE_PATH}"/internal/doi/publish_acceptance_tests #publish_acceptance_test "$(get_env ACCEPTANCE_TESTS_TASK_NAME)" "$(get_env ACCEPTANCE_TESTS_STEP_NAME)" "com.ibm.acceptance_tests" # collector_cd echo "Processing 'build-image-signing' ..." -. "${ONE_PIPELINE_PATH}"/evidence/collector \ +. "${ONE_PIPELINE_PATH}"/internal/evidence/collector \ "$(get_env IMAGE_SIGNING_TASK_NAME)" `# task_name` \ "$(get_env IMAGE_SIGNING_STEP_NAME)" `# step_name` \ "sign-artifact" `# stage` \ @@ -52,7 +52,7 @@ echo "Processing 'build-image-signing' ..." "" `# artifacts` echo "Processing 'acceptance-test' ..." -. "${ONE_PIPELINE_PATH}"/evidence/collector \ +. "${ONE_PIPELINE_PATH}"/internal/evidence/collector \ "$(get_env ACCEPTANCE_TESTS_TASK_NAME)" `# task_name` \ "$(get_env ACCEPTANCE_TESTS_STEP_NAME)" `# step_name` \ "acceptance-test" `# stage` \ @@ -66,12 +66,12 @@ echo "Processing 'acceptance-test' ..." echo -e "\n" -#. "${ONE_PIPELINE_PATH}"/evidence/create_summary "from-every-inventory-entry" "include_cd_evidence" +#. "${ONE_PIPELINE_PATH}"/internal/evidence/create_summary "from-every-inventory-entry" "include_cd_evidence" -#. "${ONE_PIPELINE_PATH}"/evidence/upload_summary +#. "${ONE_PIPELINE_PATH}"/internal/evidence/upload_summary # collector_cd_final -. "${ONE_PIPELINE_PATH}"/evidence/upload_pipeline_data +. "${ONE_PIPELINE_PATH}"/internal/evidence/upload_pipeline_data printf "\n\nCollect and upload pipeline logs\n\n" >&2 upload_pipeline_task_logs "cd" @@ -81,6 +81,6 @@ upload_pipeline_run_data "cd" echo -e "\n" -"${ONE_PIPELINE_PATH}/slack/generate_cd_end_message.py" | "${ONE_PIPELINE_PATH}/slack/post_message.py" || true +"${ONE_PIPELINE_PATH}/internal/slack/generate_cd_end_message.py" | "${ONE_PIPELINE_PATH}/internal/slack/post_message.py" || true -#. "${ONE_PIPELINE_PATH}"/pipeline/evaluator_cd +#. "${ONE_PIPELINE_PATH}"/internal/pipeline/evaluator_cd