summaryrefslogtreecommitdiff
path: root/0129-do-not-use-1000-as-the-test-gid-to-prevent-conflicts.patch
blob: d6f05332b671f71d0f7c01db2533597c64ba9af8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From 10af937fc2e095bce2da902c20e1f6b5e6178387 Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Mon, 9 Sep 2024 17:18:52 +0800
Subject: [PATCH 136/149] do not use 1000 as the test gid to prevent conflicts
 with existing gids in the image

Signed-off-by: zhongtao <zhongtao17@huawei.com>
---
 CI/test_cases/container_cases/exec_additional_gids.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CI/test_cases/container_cases/exec_additional_gids.sh b/CI/test_cases/container_cases/exec_additional_gids.sh
index 2edfd750..a62ab78c 100755
--- a/CI/test_cases/container_cases/exec_additional_gids.sh
+++ b/CI/test_cases/container_cases/exec_additional_gids.sh
@@ -25,7 +25,8 @@ source ../helpers.sh
 test_log=$(mktemp /tmp/additional_gids_test_XXX)
 
 USERNAME="user"
-USER_UID="1000"
+# Do not use 1000 as the test gid because "ubuntu:x:1000:" already exists in the ubuntu image
+USER_UID="1002"
 USER_GID="$USER_UID"
 ADDITIONAL_GID="1001"
 ADDITIONAL_GROUP="additional"
-- 
2.25.1