Skip to content

Use unpriviledged user in mass rebuild container #1287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use unpriviledged user in mass rebuild container #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Containerfile.mass-rebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ RUN dnf -y copr enable tstellar/fedora-clang-default-cc

RUN dnf -y install jq cmake ninja-build git binutils-devel clang fedora-clang-default-cc rpmbuild ccache

WORKDIR /root
RUN useradd -m rebuild-user

RUN echo 'rebuild-user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

USER rebuild-user

WORKDIR /home/rebuild-user

RUN git clone https://github.com/llvm/llvm-project

WORKDIR /root/llvm-project
WORKDIR /home/rebuild-user/llvm-project

ADD bisect.sh git-bisect-script.sh .

Expand Down
14 changes: 7 additions & 7 deletions scripts/bisect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ function test_with_copr_builds {
copr_project=$1
srpm_name=$2

dnf remove -y clang llvm
dnf copr enable -y $copr_project
dnf install --best -y clang llvm
dnf builddep -y $srpm_name
sudo dnf remove -y clang llvm
sudo dnf copr enable -y $copr_project
sudo dnf install --best -y clang llvm
sudo dnf builddep -y $srpm_name
# Disable project so future installs don't use it.
dnf copr disable $copr_project
sudo dnf copr disable $copr_project
if ! rpmbuild -D '%toolchain clang' -rb $srpm_name; then
return 1
fi
Expand Down Expand Up @@ -113,7 +113,7 @@ srpm_name=$(find $(rpm --eval %{_srcrpmdir}) -iname '*.src.rpm')
# We need to do this because the runtime repo dependencies from
# the snapshot copr projects is not resolved when using dnf5 see:
# https://github.com/fedora-copr/copr/issues/3387
dnf copr enable -y @fedora-llvm-team/llvm-compat-packages
sudo dnf copr enable -y @fedora-llvm-team/llvm-compat-packages

# Test if the good commit still succeeds. A failure may indicate an
# intermittent failure or an issue that is unrelated to LLVM. In either case,
Expand Down Expand Up @@ -156,7 +156,7 @@ while [ True ]; do
fi
done

dnf builddep -y $srpm_name
sudo dnf builddep -y $srpm_name
git bisect start
git bisect good $good_commit
git bisect bad $bad_commit
Expand Down