From: wang biao Date: Sun, 24 Apr 2022 11:08:01 +0000 (+0800) Subject: Fix test case run error X-Git-Tag: submit/trunk/20220427.104859^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b09c24291f72ab2edea79a06dc6efd4a44019f00;p=tools%2Fitest-cases-gbs.git Fix test case run error These run errors are caused by one issue: git package has been upgraded. when using git command to operate a directory that not belong to current user, it will show such error: fatal: unsafe repository ('XXX' is owned by someone else) To add an exception for this directory, call: git config --global --add safe.directory XXX Change-Id: I2a239c3b74d80549e4ad7a6f5cc18e35e969ecd9 Signed-off-by: wang biao --- diff --git a/cases/build/test_build_as_root.case b/cases/build/test_build_as_root.case index da22113..695c851 100644 --- a/cases/build/test_build_as_root.case +++ b/cases/build/test_build_as_root.case @@ -20,7 +20,7 @@ sudo /bin/rm -rf /root/GBS-ROOT/local/repos cp base.cfg /var/tmp/ - +sudo su -l root -c "git config --global --add safe.directory /var/tmp/fake" sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --clean /var/tmp/fake" diff --git a/cases/build/test_build_incremental_incremental_noinit_ia32.case b/cases/build/test_build_incremental_incremental_noinit_ia32.case index 93cbd95..23d6ec1 100644 --- a/cases/build/test_build_incremental_incremental_noinit_ia32.case +++ b/cases/build/test_build_incremental_incremental_noinit_ia32.case @@ -12,6 +12,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos gbs -c base.cfg build --clean -A i586 +git config --global --add safe.directory $PWD/sw-tools gbs -c base.cfg build --incremental -A i586 2>&1 | tee log test -n "`grep "generate repositories" log`" diff --git a/cases/build/test_build_incremental_self_overwrite_ia32.case b/cases/build/test_build_incremental_self_overwrite_ia32.case index b2080cb..a5b9a59 100644 --- a/cases/build/test_build_incremental_self_overwrite_ia32.case +++ b/cases/build/test_build_incremental_self_overwrite_ia32.case @@ -12,6 +12,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos gbs -c base.cfg build --clean -A i586 2>&1 | tee log +git config --global --add safe.directory $PWD/sw-tools gbs -c base.cfg build --incremental -A i586 2>&1 | tee log test -z "`grep "mount:.*scratch" log`" diff --git a/cases/build/test_build_incremental_skip-srcrpm.case b/cases/build/test_build_incremental_skip-srcrpm.case index 5ae394c..f7da698 100644 --- a/cases/build/test_build_incremental_skip-srcrpm.case +++ b/cases/build/test_build_incremental_skip-srcrpm.case @@ -16,6 +16,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos ./create_proj sw-tools.spec +git config --global --add safe.directory $PWD/sw-tools # GBS build --incremental with --skip-srcrpm option gbs -c base.cfg build --incremental --skip-srcrpm -A i586 sw-tools 2>&1 | tee log1 diff --git a/cases/build/test_build_mount_on_buildroot_ia32.case b/cases/build/test_build_mount_on_buildroot_ia32.case index bb32ba4..76c5b97 100644 --- a/cases/build/test_build_mount_on_buildroot_ia32.case +++ b/cases/build/test_build_mount_on_buildroot_ia32.case @@ -15,7 +15,7 @@ sudo /bin/rm -rf $GBS_LOCAL_REPOS ./create_proj fake.spec - +git config --global --add safe.directory $PWD/fake gbs -c base.cfg build -A i586 --clean --incremental fake sudo mount -o bind fake $GBS_ROOT_I686_0/home/abuild/ diff --git a/cases/build/test_build_no-configure_arm.case b/cases/build/test_build_no-configure_arm.case index 26c8a52..86bd443 100644 --- a/cases/build/test_build_no-configure_arm.case +++ b/cases/build/test_build_no-configure_arm.case @@ -31,7 +31,7 @@ git commit -m 'add configure' cd .. gbs -c base.cfg build --clean -A armv7l -D tizen.conf fake - +git config --global --add safe.directory $PWD/fake gbs -c base.cfg build --incremental -A armv7l -D tizen.conf fake 2>&1| tee log #configure has been executed diff --git a/cases/build/test_build_no-configure_ia32.case b/cases/build/test_build_no-configure_ia32.case index 1e29b69..2524ad6 100644 --- a/cases/build/test_build_no-configure_ia32.case +++ b/cases/build/test_build_no-configure_ia32.case @@ -31,6 +31,7 @@ cd .. gbs -c base.cfg build --clean -A i586 fake 2>&1| tee log +git config --global --add safe.directory $PWD/fake gbs -c base.cfg build --incremental -A i586 fake 2>&1| tee log #configure has been executed diff --git a/cases/export/gbs_export_pkgdir_nowrite.case b/cases/export/gbs_export_pkgdir_nowrite.case index 1e4a8cb..c0d4cf9 100644 --- a/cases/export/gbs_export_pkgdir_nowrite.case +++ b/cases/export/gbs_export_pkgdir_nowrite.case @@ -12,6 +12,8 @@ cd fake +#since Ubuntu 18.04, there is something change for git, need to use the below command firstly if using sudo. +sudo git config --global --add safe.directory $PWD sudo gbs ex (! gbs ex 2>&1 | tee ../log) diff --git a/sudoers.itest_cases_gbs b/sudoers.itest_cases_gbs index 9b8effb..5ccc828 100644 --- a/sudoers.itest_cases_gbs +++ b/sudoers.itest_cases_gbs @@ -1,7 +1,7 @@ Cmnd_Alias GBS = /bin/gbs, /usr/bin/gbs, /usr/local/bin/gbs Cmnd_Alias TEST = /bin/test, /usr/bin/test Cmnd_Alias USER = /usr/sbin/useradd, /usr/sbin/userdel -Cmnd_Alias GIT = /usr/bin/git config --system user.* +Cmnd_Alias GIT = /usr/bin/git config --system user.*, /usr/bin/git config --global --add safe.directory* Cmnd_Alias FILE_ATTR = /bin/chown, /bin/chmod Cmnd_Alias RM = /bin/rm -rf /home/build/testspace, /bin/rm -rf /tmp/itestuser*, /bin/rm -rf tmp_buildroot, /bin/rm -rf /home/build/GBS-ROOT/*, /bin/rm -rf /home/build/buildroot*, /bin/rm -rf /var/tmp/*, /bin/rm -rf /root/GBS-ROOT/* Cmnd_Alias SED = /bin/sed