Skip to content

Commit

Permalink
Merge pull request #65 from WASdev/commonsPath
Browse files Browse the repository at this point in the history
Change variable to COMMONS_PATH
  • Loading branch information
kevin-ortega authored Mar 27, 2024
2 parents 8eedcd0 + e27ac49 commit 8f44450
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .one-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static-scan:
EOF
chmod -x "$WORKSPACE"/websphere-liberty-s2i/sonar-project.properties
#echo "$SONAR_PASS" >> /tmp/sonarqube-token
"${ONE_PIPELINE_PATH}"/internal/sonarqube/sonarqube_run
"${COMMONS_PATH}"/internal/sonarqube/sonarqube_run
containerize:
Expand Down Expand Up @@ -320,7 +320,7 @@ release:
echo "Cloning inventory repository: $INVENTORY_REPO"
cd "$WORKSPACE"
APP_TOKEN_PATH="$WORKSPACE/secrets/app-token"
. "${ONE_PIPELINE_PATH}"/git/clone_repo \
. "${COMMONS_PATH}"/git/clone_repo \
"$INVENTORY_REPO" \
"master" \
"" \
Expand Down
22 changes: 11 additions & 11 deletions pipeline/cd_finish
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ fi

export WORKSPACE

. "${ONE_PIPELINE_PATH}"/internal/pipeline/variables_config
. "${ONE_PIPELINE_PATH}"/tools/retry
. "${COMMONS_PATH}"/internal/pipeline/variables_config
. "${COMMONS_PATH}"/tools/retry

cd "$WORKSPACE"

Expand All @@ -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}"/internal/security-compliance/scan
. "${COMMONS_PATH}"/internal/security-compliance/scan

. "${ONE_PIPELINE_PATH}"/internal/doi/publish_acceptance_tests
. "${COMMONS_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}"/internal/evidence/collector \
. "${COMMONS_PATH}"/internal/evidence/collector \
"$(get_env IMAGE_SIGNING_TASK_NAME)" `# task_name` \
"$(get_env IMAGE_SIGNING_STEP_NAME)" `# step_name` \
"sign-artifact" `# stage` \
Expand All @@ -52,7 +52,7 @@ echo "Processing 'build-image-signing' ..."
"" `# artifacts`

echo "Processing 'acceptance-test' ..."
. "${ONE_PIPELINE_PATH}"/internal/evidence/collector \
. "${COMMONS_PATH}"/internal/evidence/collector \
"$(get_env ACCEPTANCE_TESTS_TASK_NAME)" `# task_name` \
"$(get_env ACCEPTANCE_TESTS_STEP_NAME)" `# step_name` \
"acceptance-test" `# stage` \
Expand All @@ -66,12 +66,12 @@ echo "Processing 'acceptance-test' ..."

echo -e "\n"

#. "${ONE_PIPELINE_PATH}"/internal/evidence/create_summary "from-every-inventory-entry" "include_cd_evidence"
#. "${COMMONS_PATH}"/internal/evidence/create_summary "from-every-inventory-entry" "include_cd_evidence"

#. "${ONE_PIPELINE_PATH}"/internal/evidence/upload_summary
#. "${COMMONS_PATH}"/internal/evidence/upload_summary

# collector_cd_final
. "${ONE_PIPELINE_PATH}"/internal/evidence/upload_pipeline_data
. "${COMMONS_PATH}"/internal/evidence/upload_pipeline_data

printf "\n\nCollect and upload pipeline logs\n\n" >&2
upload_pipeline_task_logs "cd"
Expand All @@ -81,6 +81,6 @@ upload_pipeline_run_data "cd"

echo -e "\n"

"${ONE_PIPELINE_PATH}/internal/slack/generate_cd_end_message.py" | "${ONE_PIPELINE_PATH}/internal/slack/post_message.py" || true
"${COMMONS_PATH}/internal/slack/generate_cd_end_message.py" | "${COMMONS_PATH}/internal/slack/post_message.py" || true

#. "${ONE_PIPELINE_PATH}"/internal/pipeline/evaluator_cd
#. "${COMMONS_PATH}"/internal/pipeline/evaluator_cd

0 comments on commit 8f44450

Please sign in to comment.