Skip to content
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

Jump to bottom

backport: fix cbs el9 build issue #700

Merged
merged 2 commits into from
Oct 5, 2022
Merged

backport: fix cbs el9 build issue #700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42144cf
Skip validation of build environment
mwperina Oct 4, 2022
1ea1b56
Increase GWT localWorkers to 2
mwperina Oct 5, 2022
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
4 changes: 2 additions & 2 deletions ovirt-engine.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
%endif

# Limit GWT resources to pass the build in CBS
%global ovirt_build_extra_flags_rpm -Dgwt.compiler.localWorkers=1
%global ovirt_build_extra_flags_rpm -Dgwt.compiler.localWorkers=2

# Set "rhv_build 1" to perform RHV Manager build
%global rhv_build 0
Expand Down Expand Up @@ -148,7 +148,6 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
%if %{rhv_build}
%global wildfly_overlay_modules ""
%define extra_common_opts \\\
BUILD_ENV_VALIDATION=0 \\\
JBOSS_HOME=/opt/rh/eap7/root/usr/share/wildfly
%else
%global wildfly_overlay_modules "/usr/share/ovirt-engine-wildfly-overlay/modules"
Expand All @@ -161,6 +160,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
BUILD_LOCALES=%{ovirt_build_locales} \\\
BUILD_UT=%{ovirt_build_ut} \\\
BUILD_VALIDATION=0 \\\
BUILD_ENV_VALIDATION=0 \\\
PACKAGE_NAME=%{name} \\\
RPM_VERSION=%{version} \\\
RPM_RELEASE=%{release} \\\
Expand Down