Skip to content

csmock: use --installdeps for legacy chroots #195

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

Merged
kdudka merged 3 commits into from
Feb 18, 2025
Merged

csmock: use --installdeps for legacy chroots #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77cddec
CI: fix Testing Farm failures on f42+
kdudka Feb 17, 2025
0e76e3d
CI: fix Testing Farm failures on f42+
kdudka Feb 17, 2025
7f3d39d
csmock: use `--installdeps` for legacy chroots
kdudka Feb 17, 2025
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
11 changes: 9 additions & 2 deletions py/csmock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,15 @@ echo \"$self_pid\" > \"$lock_file\"'" \
cmd = ["--install", "module-build-macros"] + cmd_add
self.exec_mock_cmd(cmd, quiet=quiet)

# install both static and dynamic build dependencies (replacement for --installdeps)
cmd = ["--no-clean", "--calculate-build-dependencies", srpm] + cmd_add
if "rhel-7" in self.mock_profile:
# use --installdeps for legacy chroots
base_cmd = "--installdeps"
else:
# install both static and dynamic build dependencies (replacement for --installdeps)
base_cmd = "--calculate-build-dependencies"

# finally install the dependencies
cmd = ["--no-clean", base_cmd, srpm] + cmd_add
return (self.exec_mock_cmd(cmd, quiet=quiet) == 0)

def emergency_install_pkgs(self, pkgs):
Expand Down
2 changes: 1 addition & 1 deletion tests/simple_build/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rlJournalStart
rlPhaseEnd

rlPhaseStartTest "Analyze $TEST_PACKAGE using $TEST_TOOL"
rlRun "su - $TEST_USER -c 'csmock -t $TEST_TOOL $CSMOCK_EXTRA_OPTS \"$SRPM\"'" 0 \
rlRun "su - $TEST_USER -c 'csmock -t $TEST_TOOL $CSMOCK_EXTRA_OPTS \"$SRPM\" --install pam --gcc-add-flag=-std=gnu11'" 0 \
"Analyze $SRPM using $TEST_TOOL analyzer"
rlFileSubmit "/home/$TEST_USER/$TEST_PACKAGE"*.tar.xz "$SRPM-$TEST_TOOL.tar.xz"
rlPhaseEnd
Expand Down
Loading