Skip to content

Commit a3343d6

Browse files
authored
Merge pull request #2583 from vkarak/feat/change-default-autodetection
[feat] Change default hostname autodetection parameters
2 parents ee3844d + 11c3603 commit a3343d6

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

ci-scripts/ci-runner.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ checked_exec()
4141

4242
run_tutorial_checks()
4343
{
44+
export RFM_AUTODETECT_XTHOSTNAME=1
4445
cmd="./bin/reframe -C tutorials/config/settings.py -J account=jenscscs \
4546
--save-log-files --flex-alloc-nodes=2 -r -x HelloThreadedExtendedTest|BZip2.*Check $@"
4647
echo "[INFO] Running tutorial checks with \`$cmd'"
@@ -157,6 +158,7 @@ else
157158
# Run unit tests with the scheduler backends
158159
tempdir=$(mktemp -d -p $SCRATCH)
159160
echo "[INFO] Using temporary directory: $tempdir"
161+
export RFM_AUTODETECT_XTHOSTNAME=1
160162
if [[ $(hostname) =~ dom ]]; then
161163
PATH_save=$PATH
162164
export PATH=/apps/dom/UES/karakasv/slurm-wrappers/bin:$PATH

docs/manpage.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10321032
.. envvar:: RFM_AUTODETECT_FQDN
10331033

10341034
Use the fully qualified domain name as the hostname.
1035-
This is a boolean variable and defaults to ``1``.
1035+
This is a boolean variable and defaults to ``0``.
10361036

10371037

10381038
.. table::
@@ -1046,6 +1046,9 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10461046

10471047
.. versionadded:: 3.11.0
10481048

1049+
.. versionchanged:: 4.0.0
1050+
This variable now defaults to ``0``.
1051+
10491052

10501053
.. envvar:: RFM_AUTODETECT_METHOD
10511054

@@ -1071,7 +1074,7 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10711074

10721075
Use ``/etc/xthostname`` file, if present, to retrieve the current system's name.
10731076
If the file cannot be found, the hostname will be retrieved using the ``hostname`` command.
1074-
This is a boolean variable and defaults to ``1``.
1077+
This is a boolean variable and defaults to ``0``.
10751078

10761079
This option meaningful for Cray systems.
10771080

@@ -1086,6 +1089,8 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
10861089

10871090
.. versionadded:: 3.11.0
10881091

1092+
.. versionchanged:: 4.0.0
1093+
This variable now defaults to ``0``.
10891094

10901095
.. envvar:: RFM_CHECK_SEARCH_PATH
10911096

reframe/frontend/cli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,9 @@ def main():
555555
dest='autodetect_fqdn',
556556
envvar='RFM_AUTODETECT_FQDN',
557557
action='store',
558-
default=True,
558+
default=False,
559559
type=typ.Bool,
560-
help='Use FQDN as host name'
560+
help='Use the full qualified domain name as host name'
561561
)
562562
argparser.add_argument(
563563
dest='autodetect_method',
@@ -570,9 +570,9 @@ def main():
570570
dest='autodetect_xthostname',
571571
envvar='RFM_AUTODETECT_XTHOSTNAME',
572572
action='store',
573-
default=True,
573+
default=False,
574574
type=typ.Bool,
575-
help="Use Cray's xthostname file to find the host name"
575+
help="Use Cray's xthostname file to retrieve the host name"
576576
)
577577
argparser.add_argument(
578578
dest='git_timeout',

0 commit comments

Comments
 (0)