Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup hack/build-and-push.sh #986

Merged
merged 3 commits into from
May 10, 2024
Merged

Cleanup hack/build-and-push.sh #986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35ecc24
Remove unused `CSPLIT_CMD` variable
zregvart May 2, 2024
0d0685f
Fix error handling in `tkn_bundle_push`
zregvart May 2, 2024
f434af8
Double quote variables
zregvart May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions hack/build-and-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ tkn_bundle_push() {
local -r interval=${RETRY_INTERVAL:-5}
local -r max_retries=5
while true; do
tkn bundle push "$@"
tkn bundle push "$@" && break
status=$?
if [ $status == 0 ]; then
break
fi
((retry+=1))
if [ $retry -gt $max_retries ]; then
return $status
Expand Down Expand Up @@ -50,12 +47,6 @@ function save_ref() {
echo "${tagRef}@${digest}"
}

if [[ $(uname) = Darwin ]]; then
CSPLIT_CMD="gcsplit"
else
CSPLIT_CMD="csplit"
fi

if [ -z "$MY_QUAY_USER" ]; then
echo "MY_QUAY_USER is not set, skip this build."
exit 0
Expand Down Expand Up @@ -103,14 +94,14 @@ find task/*/*/ -maxdepth 0 -type d | awk -F '/' '{ print $0, $2, $3 }' | \
while read -r task_dir task_name task_version
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)
elif [ -f $task_dir/kustomization.yaml ]; then
oc kustomize $task_dir > $prepared_task_file
task_file_sha=$(sha256sum $prepared_task_file | awk '{print $1}')
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")
elif [ -f "$task_dir/kustomization.yaml" ]; then
oc kustomize "$task_dir" > "$prepared_task_file"
task_file_sha=$(sha256sum "$prepared_task_file" | awk '{print $1}')
else
echo Unknown task in $task_dir
echo Unknown task in "$task_dir"
continue
fi
repository=${TEST_REPO_NAME:-task-${task_name}}
Expand Down