[buildstream] 02/02: wip

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch juerg/ci-userchroot
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 4de4385bbf5af3077090ab8a76e233db9065e9ff
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Fri Jul 15 16:29:47 2022 +0200

    wip
---
 .github/compose/ci.docker-compose.yml |  1 +
 .github/run-userchroot-test.sh        | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index cc82b77e7..89bda85da 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -42,6 +42,7 @@ services:
   userchroot:
     <<: *tests-template
     command: .github/run-userchroot-test.sh
+    user: root
     devices: []
     image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:36-${CI_IMAGE_VERSION:-latest}
 
diff --git a/.github/run-userchroot-test.sh b/.github/run-userchroot-test.sh
index 89d56c85e..867b61d11 100755
--- a/.github/run-userchroot-test.sh
+++ b/.github/run-userchroot-test.sh
@@ -3,22 +3,22 @@
 export BST_CAS_STAGING_ROOT="/builds/userchroot"
 
 # Use buildbox-run-userchroot and hardlinking
-sudo ln -svf buildbox-run-userchroot /usr/local/bin/buildbox-run
-sudo rm -vf /usr/local/bin/buildbox-fuse
+ln -svf buildbox-run-userchroot /usr/local/bin/buildbox-run
+rm -vf /usr/local/bin/buildbox-fuse
 
 # When using userchroot, buildbox-casd must run as a separate user
-sudo useradd -g testuser buildbox-casd
-sudo chown buildbox-casd:testuser /usr/local/bin/buildbox-casd
-sudo chmod u+s /usr/local/bin/buildbox-casd
+useradd -g testuser buildbox-casd
+chown buildbox-casd:testuser /usr/local/bin/buildbox-casd
+chmod u+s /usr/local/bin/buildbox-casd
 
 # Set up staging root with permissions required by userchroot,
 # must be on same filesystem as current directory to support hardlinks
-sudo mkdir -p "${BST_CAS_STAGING_ROOT}"
-sudo chown -R buildbox-casd:testuser "${BST_CAS_STAGING_ROOT}"
+mkdir -p "${BST_CAS_STAGING_ROOT}"
+chown -R buildbox-casd:testuser "${BST_CAS_STAGING_ROOT}"
 # userchroot doesn't allow group/world-writable base directory
-sudo chmod go-w /builds
-echo buildbox-casd:${BST_CAS_STAGING_ROOT} | sudo tee /etc/userchroot.conf
+chmod go-w /builds
+echo buildbox-casd:${BST_CAS_STAGING_ROOT} | tee /etc/userchroot.conf
 
-# Created files must be writable by the group (i.e. both bst and buildbox-casd)
-umask 002
-tox -vvvvv -- --color=yes --integration
+# Run as regular user after setting up the environment.
+# Use umask as created files must be writable by the group (i.e. both bst and buildbox-casd)
+su testuser -c "umask 002 && tox -vvvvv -- --color=yes --integration"