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

…e steps Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Jul 9, 2024 · 609c035 · 609c035
1 parent 31fb32c
commit 609c035
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 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)"

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() {