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

chore(dockerfiles/cd/utils/release): pretty output for offline package steps #352

Merged
merged 2 commits into from
Jul 9, 2024
Merged

chore(dockerfiles/cd/utils/release): pretty output for offline package steps #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
609c035
chore(dockerfiles/cd/utils/release): pretty output for offline packag…
wuhuizuo Jul 9, 2024
78d8678
fix(packages/scripts): update to adjust new oras version
wuhuizuo Jul 9, 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
2 changes: 0 additions & 2 deletions packages/offline-packages.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ editions:
if: {{ semver.CheckConstraint ">=7.6.0-0" .Release.version }}
os: [linux]
arch: [amd64, arm64]
profile: [enterprise]
artifacts:
- name: "tidb-enterprise-server-{{ .Release.version }}-{{ .Release.os }}-{{ .Release.arch }}"
desc: enterprise offline server package
Expand Down Expand Up @@ -498,7 +497,6 @@ editions:
if: {{ semver.CheckConstraint ">=7.5.0-0, <7.6.0-0" .Release.version }}
os: [linux]
arch: [amd64, arm64]
profile: [enterprise]
artifacts:
- name: "tidb-enterprise-server-{{ .Release.version }}-{{ .Release.os }}-{{ .Release.arch }}"
desc: enterprise offline server package
Expand Down
4 changes: 2 additions & 2 deletions packages/scripts/build-package-artifacts.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function fetch_file_from_oci_artifact() {
local repo="$(echo $destination | cut -d ':' -f 1)"

# get the file blob digest.
oras manifest fetch $destination | yq -e --prettyPrint ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | .[0]" >blob.yaml
oras manifest fetch $destination | yq -e --prettyPrint -oy ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | .[0]" >blob.yaml

# download file
file="$(yq .annotations[\"org.opencontainers.image.title\"] blob.yaml)"
Expand Down Expand Up @@ -256,7 +256,7 @@ function write_push_results() {
# Login steps:
# local registry=$(echo "${destination}" | cut -d/ -f)
# oras login -u ${ORAS_USER} -p ${ORAS_PASSWD} ${registry}
digest="$(oras discover "${destination}" --distribution-spec v1.1-referrers-tag -o tree | cut -d@ -f2)"
digest="$(oras discover "${destination}" --distribution-spec v1.1-referrers-tag --format tree | cut -d@ -f2)"

cat <<EOF > "$result_file"
oci:
Expand Down
6 changes: 3 additions & 3 deletions packages/scripts/compose-offline-packages-artifacts.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function fetch_file_from_oci_artifact() {
local repo="$(echo $destination | cut -d ':' -f 1)"

# get the file blob digest.
oras manifest fetch $destination | yq --prettyPrint ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | .[0]" >blob.yaml
oras manifest fetch $destination | yq --prettyPrint -oy ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | .[0]" >blob.yaml

# download file
file="$(yq .annotations[\"org.opencontainers.image.title\"] blob.yaml)"
Expand All @@ -92,7 +92,7 @@ function check_file_in_oci_artifact() {
oras manifest fetch -o oci_manifest.json $destination

# get the file blob digest.
yq -e --prettyPrint ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | length > 0" oci_manifest.json
yq -e --prettyPrint -oy ".layers | filter(.annotations[\"org.opencontainers.image.title\"] | test \"$to_match_file\") | length > 0" oci_manifest.json > /dev/null
}

function pre_check() {
Expand Down Expand Up @@ -280,7 +280,7 @@ function write_push_results() {
# Login steps:
# local registry=$(echo "${destination}" | cut -d/ -f)
# oras login -u ${ORAS_USER} -p ${ORAS_PASSWD} ${registry}
digest="$(oras discover "${destination}" --distribution-spec v1.1-referrers-tag -o tree | cut -d@ -f2)"
digest="$(oras discover "${destination}" --distribution-spec v1.1-referrers-tag --format tree | cut -d@ -f2)"

cat <<EOF > "$result_file"
oci:
Expand Down
Loading