Skip to content

Commit 93fd611

Browse files
committed
ci: Do not overwrite the jobs in the file.
Do not overwrite the jobs directly in the file, use the env variable instead. Fixes: 87f3c23 ("utilities: Add simple container automation") Acked-by: Mark Michelson <mmichels@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com>
1 parent e60dfa2 commit 93fd611

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

.ci/ci.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,14 @@ function copy_sources_to_workdir() {
9292
"
9393
}
9494

95-
function overwrite_jobs() {
96-
container_exec "
97-
sed -i s/-j[0-9]/-j$jobs/ $CONTAINER_WORKDIR/.ci/linux-build.sh
98-
"
99-
}
100-
10195
function run_tests() {
10296
container_exec "
10397
cd $CONTAINER_WORKDIR \
10498
&& \
10599
ARCH=$ARCH CC=$CC LIBS=$LIBS OPTS=$OPTS TESTSUITE=$TESTSUITE \
106100
TEST_RANGE=$TEST_RANGE SANITIZERS=$SANITIZERS DPDK=$DPDK \
107101
RECHECK=$RECHECK UNSTABLE=$UNSTABLE TIMEOUT=$TIMEOUT \
108-
BASE_VERSION=$BASE_VERSION ./.ci/linux-build.sh
102+
BASE_VERSION=$BASE_VERSION JOBS=$JOBS ./.ci/linux-build.sh
109103
"
110104
}
111105

@@ -130,7 +124,7 @@ while true; do
130124
;;
131125
--jobs)
132126
shift
133-
jobs="$1"
127+
JOBS="-j$1"
134128
;;
135129
--ovn-path)
136130
shift
@@ -183,10 +177,6 @@ trap remove_container EXIT
183177

184178
copy_sources_to_workdir
185179

186-
if [ -n "$jobs" ]; then
187-
overwrite_jobs
188-
fi
189-
190180
if [ -n "$shell" ];then
191181
container_shell
192182
exit 0

0 commit comments

Comments
 (0)