Skip to content

NO-ISSUE: Enable flannel RPM build by default in build_rpms.sh #4569

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
merged 1 commit into from
Feb 24, 2025
Merged

NO-ISSUE: Enable flannel RPM build by default in build_rpms.sh #4569

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
6 changes: 4 additions & 2 deletions test/bin/build_rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
set -euo pipefail

SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Build the flannel RPM unless overridden explicitly
WITH_FLANNEL=${WITH_FLANNEL:-1}
# shellcheck source=test/bin/common.sh
source "${SCRIPTDIR}/common.sh"

Expand All @@ -15,11 +17,11 @@ build_rpms() {
rm -rf _output/rpmbuild*

# Normal build of current branch from source
local build_cmds=('make rpm')
local build_cmds=("make WITH_FLANNEL=${WITH_FLANNEL} rpm")

# In CI, build the current branch from source with the build tools using used by OCP
if [ -v CI_JOB_NAME ]; then
build_cmds=('make rpm-podman')
build_cmds=("make WITH_FLANNEL=${WITH_FLANNEL} rpm-podman")
fi

build_cmds+=(
Expand Down
2 changes: 1 addition & 1 deletion test/bin/ci_phase_iso_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ cd "${ROOTDIR}/test/"
source "${SCRIPTDIR}/common.sh"

# Re-build from source.
$(dry_run) env WITH_FLANNEL=1 bash -x ./bin/build_rpms.sh
$(dry_run) bash -x ./bin/build_rpms.sh

if ${COMPOSER_CLI_BUILDS} ; then
# Determine and create the ideal number of workers
Expand Down