From 8210e880c603186eff8154c731bb392d1413f3fa Mon Sep 17 00:00:00 2001
From: Wangchong Zhou <wangchong@konghq.com>
Date: Tue, 10 Sep 2024 21:58:31 +0800
Subject: [PATCH] chore(tests): use matched uid and gid in docker explain
 manifest test

---
 .github/matrix-commitly.yml   | 1 -
 .github/matrix-full.yml       | 1 -
 .github/workflows/release.yml | 8 +++-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/matrix-commitly.yml b/.github/matrix-commitly.yml
index 1a2962ab225f..ee1b5061286f 100644
--- a/.github/matrix-commitly.yml
+++ b/.github/matrix-commitly.yml
@@ -10,7 +10,6 @@ build-images:
   base-image: ubuntu:24.04
   package: deb
   artifact-from: ubuntu-24.04
-  check-manifest-suite: docker-image-ubuntu-24.04
 
 smoke-tests:
 - label: ubuntu
diff --git a/.github/matrix-full.yml b/.github/matrix-full.yml
index 72822d0a94e7..4c8ae1fb6a45 100644
--- a/.github/matrix-full.yml
+++ b/.github/matrix-full.yml
@@ -92,7 +92,6 @@ build-images:
   artifact-from: ubuntu-24.04
   artifact-from-alt: ubuntu-24.04-arm64
   docker-platforms: linux/amd64, linux/arm64
-  check-manifest-suite: docker-image-ubuntu-24.04
 
 # Debian
 - label: debian
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 144ab9bc0912..1f7d3de5b660 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -423,19 +423,17 @@ jobs:
         cache: 'pip' # caching pip dependencies
 
     - name: Verify
-      env:
-        SUITE: ${{ matrix.check-manifest-suite || 'docker-image' }}
       run: |
         cd scripts/explain_manifest
         # docker image verify requires sudo to set correct permissions, so we
         # also install deps for root
-        sudo -H -E pip install -r requirements.txt
+        sudo -E pip install -r requirements.txt
         IMAGE=${{ env.PRERELEASE_DOCKER_REPOSITORY }}:${{ needs.metadata.outputs.commit-sha }}-${{ matrix.label }}
 
-        sudo -H -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s "$SUITE"
+        sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s docker-image
 
         if [[ ! -z "${{ matrix.docker-platforms }}" ]]; then
-          DOCKER_DEFAULT_PLATFORM=linux/arm64 sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s "$SUITE"
+          DOCKER_DEFAULT_PLATFORM=linux/arm64 sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s docker-image
         fi
 
   scan-images: