Skip to content

Follow up to update the commit file properly based on image change #1021

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

Merged
merged 1 commit into from
Apr 16, 2025
Merged

Follow up to update the commit file properly based on image change #1021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 12 additions & 22 deletions ci/sha-digest-updater.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ USER_HASH=$1
REPO_OWNER=$2
BRANCH=$3
REPO_NAME=$4

REPO_ROOT=$(git rev-parse --show-toplevel)

# Declare and initialize the image skipping log file (This does not commit)
export SKIPPED_LOG="$REPO_ROOT/skipped-images.txt"

Expand Down Expand Up @@ -34,20 +34,16 @@ fetch_latest_hash() {
fi
}

# Updates the commits in commit.env
update_commits() {
local REPO_ROOT="$1"
local HASH="$2"
local COMMIT_ENV_PATH="$REPO_ROOT/manifests/base/commit.env"

# Get the complete list of commits N-version to update
local COMMITS
COMMITS=$(grep "\-n=" "$COMMIT_ENV_PATH" | cut -d "=" -f 1)
# Updates a corresponding image commit in commit.env
update_image_commit() {
local image_name="$1"
local hash="$2"
local commit_env_path="$REPO_ROOT/manifests/base/commit.env"

for val in $COMMITS; do
echo "Updating commit '${val}' to $HASH"
sed -i "s|${val}=.*|${val}=${HASH}|" "$COMMIT_ENV_PATH"
done
# Convert image name to match with commit variable name
commit_var=$(echo "$image_name" | sed 's/-n$/-commit-n/')
echo "Updating commit '${commit_var}' to $hash"
sed -i "s|^${commit_var}=.*|${commit_var}=${hash}|" "$commit_env_path"
}

# Function to process runtime images
Expand Down Expand Up @@ -150,10 +146,8 @@ if [[ "$REPO_OWNER" == "opendatahub-io" ]]; then
log_skipped_image "$image"
continue
fi

# use `--no-tags` for skopeo once available in newer version
digest=$(skopeo inspect --retry-times 3 "docker://${registry}:${latest_tag}" | jq .Digest | tr -d '"')

# Check for digest validity
if [[ -z "$digest" || "$digest" == "null" ]]; then
echo "Failed to get digest for $latest_tag. Skipping."
Expand All @@ -164,9 +158,8 @@ if [[ "$REPO_OWNER" == "opendatahub-io" ]]; then
output="${registry}@${digest}"
echo "NEW: ${output}"
sed -i "s|${image}=.*|${image}=${output}|" "${PARAMS_ENV_PATH}"
update_image_commit "$image" "$HASH"
done

update_commits "$REPO_ROOT" "$HASH"
update_runtime_images

# In case the digest updater function is triggered downstream.
Expand Down Expand Up @@ -205,9 +198,7 @@ elif [[ "$REPO_OWNER" == "red-hat-data-services" ]]; then
log_skipped_image "$image"
continue
fi

digest=$(skopeo inspect --retry-times 3 "docker://${registry}:${latest_tag}" | jq .Digest | tr -d '"')

# Check for digest validity
if [[ -z "$digest" || "$digest" == "null" ]]; then
echo "Failed to get digest for $latest_tag. Skipping."
Expand All @@ -218,10 +209,9 @@ elif [[ "$REPO_OWNER" == "red-hat-data-services" ]]; then
output="${registry}@${digest}"
echo "NEW: ${output}"
sed -i "s|${image}=.*|${image}=${output}|" "${PARAMS_ENV_PATH}"
update_image_commit "$image" "$HASH"
i=$((i+1))
done

update_commits "$REPO_ROOT" "$HASH"
update_runtime_images

else
Expand Down