Skip to content

Commit

Permalink
Merge pull request konflux-ci#686 from tkdchen/fix-indentations
Browse files Browse the repository at this point in the history
Fix indentations
  • Loading branch information
tkdchen authored Nov 28, 2023
2 parents 3a56657 + d6f1f4a commit 2c3d672
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions hack/build-and-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ do
prepared_task_file="${WORKDIR}/$task_name-${task_version}.yaml"
if [ -f $task_dir/$task_name.yaml ]; then
cp $task_dir/$task_name.yaml $prepared_task_file
task_file_sha=$(git log -n 1 --pretty=format:%H -- $task_dir/$task_name.yaml)
task_file_sha=$(git log -n 1 --pretty=format:%H -- $task_dir/$task_name.yaml)
elif [ -f $task_dir/kustomization.yaml ]; then
oc kustomize $task_dir > $prepared_task_file
task_file_sha=$(sha256sum $prepared_task_file | awk '{print $1}')
task_file_sha=$(sha256sum $prepared_task_file | awk '{print $1}')
else
echo Unknown task in $task_dir
continue
continue
fi
repository=${TEST_REPO_NAME:-task-${task_name}}
tag=${TEST_REPO_NAME:+${task_name}-}${task_version}
Expand All @@ -111,12 +111,12 @@ do
# version placeholder is removed naturally by the substitution.
real_task_name=$(yq e '.metadata.name' "$prepared_task_file")
sub_expr_1="
(.spec.tasks[].taskRef | select(.name == \"${real_task_name}\" and .version == \"${task_version}\" ))
|= {\"resolver\": \"bundles\", \"params\": [ { \"name\": \"name\", \"value\": \"${real_task_name}\" } , { \"name\": \"bundle\", \"value\": \"${task_bundle_with_digest}\" }, { \"name\": \"kind\", \"value\": \"task\" }] }
(.spec.tasks[].taskRef | select(.name == \"${real_task_name}\" and .version == \"${task_version}\" ))
|= {\"resolver\": \"bundles\", \"params\": [ { \"name\": \"name\", \"value\": \"${real_task_name}\" } , { \"name\": \"bundle\", \"value\": \"${task_bundle_with_digest}\" }, { \"name\": \"kind\", \"value\": \"task\" }] }
"
sub_expr_2="
(.spec.finally[].taskRef | select(.name == \"${real_task_name}\" and .version == \"${task_version}\" ))
|= {\"resolver\": \"bundles\", \"params\": [ { \"name\": \"name\", \"value\": \"${real_task_name}\" } , { \"name\": \"bundle\", \"value\": \"${task_bundle_with_digest}\" },{ \"name\": \"kind\", \"value\": \"task\" }] }
(.spec.finally[].taskRef | select(.name == \"${real_task_name}\" and .version == \"${task_version}\" ))
|= {\"resolver\": \"bundles\", \"params\": [ { \"name\": \"name\", \"value\": \"${real_task_name}\" } , { \"name\": \"bundle\", \"value\": \"${task_bundle_with_digest}\" },{ \"name\": \"kind\", \"value\": \"task\" }] }
"
for filename in "$generated_pipelines_dir"/*.yaml "$core_services_pipelines_dir"/*.yaml
do
Expand Down

0 comments on commit 2c3d672

Please sign in to comment.