chore(dockerfiles/cd/utils/release): pretty output for offline packag…

…e steps (#352) ### **User description** Signed-off-by: wuhuizuo <wuhuizuo@126.com> ___ ### **PR Type** enhancement, bug fix ___ ### **Description** - Removed `profile` attribute from enterprise server package definitions in `packages/offline-packages.yaml.tmpl`. - Added `-oy` flag to `yq` command for pretty output in `fetch_file_from_oci_artifact` function in `packages/scripts/build-package-artifacts.sh.tmpl`. - Added `-oy` flag to `yq` command for pretty output in `fetch_file_from_oci_artifact` and `check_file_in_oci_artifact` functions in `packages/scripts/compose-offline-packages-artifacts.sh.tmpl`. ___ ### **Changes walkthrough** 📝 <table><thead><tr><th></th><th align="left">Relevant files</th></tr></thead><tbody><tr><td><strong>Enhancement</strong></td><td><table> <tr> <td> <details> <summary><strong>offline-packages.yaml.tmpl</strong><dd><code>Remove profile attribute from enterprise server packages</code>  </dd></summary> <hr> packages/offline-packages.yaml.tmpl <li>Removed <code>profile</code> attribute from enterprise server package definitions.<br> </details> </td> <td><a href="https://github.com/PingCAP-QE/artifacts/pull/352/files#diff-2137803228fa3604db13ae34662a3b6cbea45ebd2fdbe05bcff3702086de937a">+0/-2</a>      </td> </tr> <tr> <td> <details> <summary><strong>build-package-artifacts.sh.tmpl</strong><dd><code>Add pretty output flag to yq command in build script</code>          </dd></summary> <hr> packages/scripts/build-package-artifacts.sh.tmpl <li>Added <code>-oy</code> flag to <code>yq</code> command for pretty output in <br><code>fetch_file_from_oci_artifact</code> function.<br> </details> </td> <td><a href="https://github.com/PingCAP-QE/artifacts/pull/352/files#diff-cf20d974cb7ce33eabaed78af58fdae85cf219622fa1ab50b3fb5e9eedc8240e">+1/-1</a>      </td> </tr> <tr> <td> <details> <summary><strong>compose-offline-packages-artifacts.sh.tmpl</strong><dd><code>Add pretty output flag to yq command in compose script</code>      </dd></summary> <hr> packages/scripts/compose-offline-packages-artifacts.sh.tmpl <li>Added <code>-oy</code> flag to <code>yq</code> command for pretty output in <br><code>fetch_file_from_oci_artifact</code> and <code>check_file_in_oci_artifact</code> functions.<br> <br> </details> </td> <td><a href="https://github.com/PingCAP-QE/artifacts/pull/352/files#diff-736f82b81ae1efe77472277e7b3332c40bc8e35010cdcdd35415514a157ba55a">+2/-2</a>      </td> </tr> </table></td></tr></tr></tbody></table> ___ > 💡 **PR-Agent usage**: >Comment `/help` on the PR to get a list of all available PR-Agent tools and their descriptions --------- Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Jul 9, 2024 · 62eb57b · 62eb57b
1 parent 31fb32c
commit 62eb57b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/packages/offline-packages.yaml.tmpl b/packages/offline-packages.yaml.tmpl
@@ -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
@@ -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

diff --git a/packages/scripts/build-package-artifacts.sh.tmpl b/packages/scripts/build-package-artifacts.sh.tmpl
@@ -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)"
@@ -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:

diff --git a/packages/scripts/compose-offline-packages-artifacts.sh.tmpl b/packages/scripts/compose-offline-packages-artifacts.sh.tmpl
@@ -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)"
@@ -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() {
@@ -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: