Signed-off-by: Ales Musil <[email protected]>
---
.ci/ovn_upgrade_test.py | 2 +-
.ci/ovn_upgrade_utils.py | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.ci/ovn_upgrade_test.py b/.ci/ovn_upgrade_test.py
index 44afd7e2d..e38145cc2 100755
--- a/.ci/ovn_upgrade_test.py
+++ b/.ci/ovn_upgrade_test.py
@@ -35,7 +35,7 @@ def run_tests(config):
cmd = f"""CC={config.env.cc} TESTSUITE=system-test UPGRADE_TEST=yes
TEST_RANGE="{config.env.flags}" UNSTABLE={config.env.unstable}
- NO_DEBUG={no_debug}
+ ARCH="{config.env.arch}" NO_DEBUG={no_debug}
. {config.path.ovn_root_dir}/.ci/linux-build.sh"""
return run_shell_command(cmd)
diff --git a/.ci/ovn_upgrade_utils.py b/.ci/ovn_upgrade_utils.py
index cf39aedf9..b96696e1a 100755
--- a/.ci/ovn_upgrade_utils.py
+++ b/.ci/ovn_upgrade_utils.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
import os
+import platform
import re
import shutil
import subprocess
@@ -60,6 +61,7 @@ class EnvConfig:
jobs: str
opts: str
unstable: str
+ arch: str
use_sparse: str
@@ -101,6 +103,7 @@ class UpgradeConfig:
jobs=os.environ.get('JOBS', ''),
opts=os.environ.get('OPTS', ''),
unstable=os.environ.get('UNSTABLE', 'no'),
+ arch=os.environ.get('ARCH', platform.machine()),
# Enable parse in CI. Disable for local run as might depend of
# content of /usr/local/include/openvswitch
use_sparse='yes' if (is_ci and shutil.which('sparse')) else 'no'
@@ -111,8 +114,8 @@ class UpgradeConfig:
def get_ctx(self):
env = os.environ.copy()
- env.update(CC=self.env.cc, OPTS=self.env.opts,
- JOBS=self.env.jobs, USE_SPARSE=self.env.use_sparse)
+ env.update(CC=self.env.cc, OPTS=self.env.opts, JOBS=self.env.jobs,
+ ARCH=self.env.arch, USE_SPARSE=self.env.use_sparse)
return env
--
2.55.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
