diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 75ce018f41f..dbd79d81c9f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,60 +2,60 @@ # a component sha1 to ensure that corresponding package build is done #utils/build.config @daos-stack/release-engineering # or updates packaging in any way -utils/rpms @daos-stack/build-and-release-watchers +#utils/rpms @daos-stack/build-and-release-watchers -src/gurt @daos-stack/common-watchers -src/common @daos-stack/common-watchers +#src/gurt @daos-stack/common-watchers +#src/common @daos-stack/common-watchers # any PR that touches Go files should get a review from go-owners -*.go @daos-stack/go-owners @daos-stack/go-watchers +#*.go @daos-stack/go-owners @daos-stack/go-watchers # Notify vos-watcher of files touched affecting VOS -src/vos/ @daos-stack/vos-owners @daos-stack/vos-watchers -src/bio/ @daos-stack/vos-owners @daos-stack/vos-watchers -src/vea/ @daos-stack/vos-owners @daos-stack/vos-watchers -src/common/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers -src/include/daos/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers -src/include/daos_srv/vos*.* @daos-stack/vos-owners @daos-stack/vos-watchers -src/include/daos_srv/evtree.h @daos-stack/vos-owners @daos-stack/vos-watchers +#src/vos/ @daos-stack/vos-owners @daos-stack/vos-watchers +#src/bio/ @daos-stack/vos-owners @daos-stack/vos-watchers +#src/vea/ @daos-stack/vos-owners @daos-stack/vos-watchers +#src/common/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers +#src/include/daos/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers +#src/include/daos_srv/vos*.* @daos-stack/vos-owners @daos-stack/vos-watchers +#src/include/daos_srv/evtree.h @daos-stack/vos-owners @daos-stack/vos-watchers # Jenkinsfile changes should be reviewed by Release Engineering -Jenkinsfile @daos-stack/build-and-release-watchers +#Jenkinsfile @daos-stack/build-and-release-watchers # any PR that touches client API or high level client code -src/client @daos-stack/client-api-owners @daos-stack/client-api-watchers -src/include/daos_*.* @daos-stack/client-api-owners @daos-stack/client-api-watchers +#src/client @daos-stack/client-api-owners @daos-stack/client-api-watchers +#src/include/daos_*.* @daos-stack/client-api-owners @daos-stack/client-api-watchers # doc-watchers: files affecting documentation (docs, doxygen, etc.) -mkdocs.yml @daos-stack/doc-watchers -Doxyfile @daos-stack/doc-watchers -docs/ @daos-stack/doc-watchers +#mkdocs.yml @daos-stack/doc-watchers +#Doxyfile @daos-stack/doc-watchers +#docs/ @daos-stack/doc-watchers #src/include/*.h @daos-stack/doc-watchers -*.md @daos-stack/doc-watchers +#*.md @daos-stack/doc-watchers # dev-build-watchers: Files affecting local builds (e.g. SCons) -SConstruct @daos-stack/dev-build-owners @daos-stack/dev-build-watchers -SConscript @daos-stack/dev-build-owners @daos-stack/dev-build-watchers -site_scons/ @daos-stack/dev-build-owners @daos-stack/dev-build-watchers -utils/sl @daos-stack/dev-build-owners @daos-stack/dev-build-watchers +#SConstruct @daos-stack/dev-build-owners @daos-stack/dev-build-watchers +#SConscript @daos-stack/dev-build-owners @daos-stack/dev-build-watchers +#site_scons/ @daos-stack/dev-build-owners @daos-stack/dev-build-watchers +#utils/sl @daos-stack/dev-build-owners @daos-stack/dev-build-watchers # ftest-watchers: files affecting functional tests -src/tests/ftest @daos-stack/ftest-owners @daos-stack/ftest-watchers +#src/tests/ftest @daos-stack/ftest-owners @daos-stack/ftest-watchers # telem-watchers: Changes related to the telemetry library -src/utils/daos_metrics @daos-stack/telem-watchers -src/gurt/telemetry.c @daos-stack/telem-watchers +#src/utils/daos_metrics @daos-stack/telem-watchers +#src/gurt/telemetry.c @daos-stack/telem-watchers # PRs that touch the object layer -src/object/ @daos-stack/object-owners @daos-stack/object-watchers -src/rebuild/ @daos-stack/object-owners @daos-stack/object-watchers -src/dtx/ @daos-stack/object-owners @daos-stack/object-watchers +#src/object/ @daos-stack/object-owners @daos-stack/object-watchers +#src/rebuild/ @daos-stack/object-owners @daos-stack/object-watchers +#src/dtx/ @daos-stack/object-owners @daos-stack/object-watchers # PRs that touch the CaRT layer -src/cart/ @daos-stack/cart-owners @daos-stack/cart-watchers +#src/cart/ @daos-stack/cart-owners @daos-stack/cart-watchers # PRs that touch the metadata -src/pool/ @daos-stack/metadata-owners @daos-stack/metadata-watchers -src/container/ @daos-stack/metadata-owners @daos-stack/metadata-watchers -src/rdb/ @daos-stack/metadata-owners @daos-stack/metadata-watchers -src/rsvc/ @daos-stack/metadata-owners @daos-stack/metadata-watchers +#src/pool/ @daos-stack/metadata-owners @daos-stack/metadata-watchers +#src/container/ @daos-stack/metadata-owners @daos-stack/metadata-watchers +#src/rdb/ @daos-stack/metadata-owners @daos-stack/metadata-watchers +#src/rsvc/ @daos-stack/metadata-owners @daos-stack/metadata-watchers diff --git a/Jenkinsfile b/Jenkinsfile index 7072405296b..04d09d44a2a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -271,25 +271,25 @@ pipeline { description: 'Run the Functional on Ubuntu 20.04 test stage' + ' Requires CI_MORE_FUNCTIONAL_PR_TESTS') booleanParam(name: 'CI_medium_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Medium test stage') booleanParam(name: 'CI_medium_md_on_ssd_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Medium MD on SSD test stage') booleanParam(name: 'CI_medium_verbs_provider_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Medium Verbs Provider test stage') booleanParam(name: 'CI_medium_verbs_provider_md_on_ssd_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Medium Verbs Provider MD on SSD test stage') booleanParam(name: 'CI_medium_ucx_provider_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Medium UCX Provider test stage') booleanParam(name: 'CI_large_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Large test stage') booleanParam(name: 'CI_large_md_on_ssd_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional Hardware Large MD on SSD test stage') string(name: 'CI_UNIT_VM1_LABEL', defaultValue: 'ci_vm1', diff --git a/debian/rules b/debian/rules index b1ecfbb69a7..5b4bb7f6b85 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ endif SCONS = scons -j $(NUMJOBS) DEB_SCONS_OPTIONS := --config=force --no-rpath USE_INSTALLED=all \ CONF_DIR=$(sysconfdir)/daos PREFIX=$(prefix) \ - $(SCONS_ARGS) + $(SCONS_ARGS) STATIC_FUSE=0 export GOCACHE := $(CURDIR)/.gocache @@ -34,7 +34,7 @@ override_dh_auto_build: override_dh_auto_clean: echo $(DEB_BUILD_OPTIONS) - $(SCONS) --clean + $(SCONS) --clean STATIC_FUSE=0 rm -rf build install find . -name '*.pyc' -delete rm -rf _build.external-Linux diff --git a/src/cart/utils/memcheck-cart.supp b/src/cart/utils/memcheck-cart.supp index 8e4e37a531f..82a5251490c 100644 --- a/src/cart/utils/memcheck-cart.supp +++ b/src/cart/utils/memcheck-cart.supp @@ -501,9 +501,12 @@ Memcheck:Param sendmsg(msg.msg_iov[1]) ... + fun:sendmsg + fun:ofi_sockapi_sendv_socket fun:ofi_bsock_sendv ... fun:fi_senddata + ... } { Tcp provider with ofi rxm diff --git a/src/tests/ftest/cart/no_pmix_group_test.c b/src/tests/ftest/cart/no_pmix_group_test.c index d5db7f230f1..f6617d11741 100644 --- a/src/tests/ftest/cart/no_pmix_group_test.c +++ b/src/tests/ftest/cart/no_pmix_group_test.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2018-2022 Intel Corporation. + * (C) Copyright 2018-2024 Intel Corporation. * * SPDX-License-Identifier: BSD-2-Clause-Patent */ @@ -686,8 +686,7 @@ int main(int argc, char **argv) } for (i = 0; i < 10; i++) { - rc = asprintf(&uris[i], "ofi+tcp://127.0.0.1:%d", - 10000 + i); + rc = asprintf(&uris[i], "ofi+tcp://127.0.0.1:%d", 10000 + i); if (rc == -1) { D_ERROR("asprintf() failed\n"); assert(0); diff --git a/src/tests/ftest/control/config_generate_output.py b/src/tests/ftest/control/config_generate_output.py index 870ae538906..b526e3d93b5 100644 --- a/src/tests/ftest/control/config_generate_output.py +++ b/src/tests/ftest/control/config_generate_output.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2018-2023 Intel Corporation. + (C) Copyright 2018-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -194,14 +194,6 @@ def test_basic_config(self): self.prepare_expected_data() # 1. Call dmg config generate. - if storage["class"] == "ram": - # Verify scm_list value is not set: - if "scm_list" in storage: - errors.append("unexpected scm_list field exists in ram tier") - # Verify scm_size value is set: - if "scm_size" not in storage: - errors.append("Expected scm_size field does not exist in ram tier") - scm_found = True result = self.get_dmg_command().config_generate( access_points="wolf-a", net_provider=self.def_provider) generated_yaml = yaml.safe_load(result.stdout) diff --git a/src/tests/ftest/util/server_utils.py b/src/tests/ftest/util/server_utils.py index 2037a0d0c83..5a138355159 100644 --- a/src/tests/ftest/util/server_utils.py +++ b/src/tests/ftest/util/server_utils.py @@ -712,10 +712,10 @@ def stop(self): if self.manager.job.using_nvme: # Reset the storage - #try: - # self.reset_storage() - #except ServerFailed as error: - # messages.append(str(error)) + # try: + # self.reset_storage() + # except ServerFailed as error: + # messages.append(str(error)) # Make sure the mount directory belongs to non-root user self.set_scm_mount_ownership() diff --git a/utils/githooks/commit-msg.d/google-changeId.py b/utils/githooks/commit-msg.d/google_change_id.py similarity index 93% rename from utils/githooks/commit-msg.d/google-changeId.py rename to utils/githooks/commit-msg.d/google_change_id.py index b6752f6aac7..6d1403157b7 100755 --- a/utils/githooks/commit-msg.d/google-changeId.py +++ b/utils/githooks/commit-msg.d/google_change_id.py @@ -2,7 +2,8 @@ """Wrapper for changeId hook""" import os import sys -import subprocess +from subprocess import call as subcall # nosec B404 + def run_changeid_hook(): """Execute the changeId.sh hook from user area""" @@ -35,7 +36,7 @@ def run_changeid_hook(): args = sys.argv args[0] = hookpath - return subprocess.call(args) + return subcall(args) if __name__ == "__main__": diff --git a/utils/node_local_test.py b/utils/node_local_test.py index 25f206054f0..382af6a0e98 100755 --- a/utils/node_local_test.py +++ b/utils/node_local_test.py @@ -24,7 +24,6 @@ import pickle # nosec import pprint import pwd -import random import re import shutil import signal diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index b7cf275db59..e9298db9fb3 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -327,6 +327,7 @@ This is the package that bridges the difference between the MOFED openmpi --config=force \ --no-rpath \ USE_INSTALLED=all \ + STATIC_FUSE=0 \ FIRMWARE_MGMT=yes \ CONF_DIR=%{conf_dir} \ %{?scons_args} \ @@ -344,6 +345,7 @@ mv test.cov{,-build} %{buildroot}%{_prefix} \ %{buildroot}%{conf_dir} \ USE_INSTALLED=all \ + STATIC_FUSE=0 \ FIRMWARE_MGMT=yes \ CONF_DIR=%{conf_dir} \ PREFIX=%{_prefix} \ diff --git a/utils/run_utest.py b/utils/run_utest.py index 1e5059054f5..2068360ab7d 100755 --- a/utils/run_utest.py +++ b/utils/run_utest.py @@ -7,6 +7,7 @@ Test script for running all DAOS unit tests """ import argparse +import getpass import json # pylint: disable=broad-except import os @@ -19,7 +20,6 @@ import yaml from junit_xml import TestCase, TestSuite -import getpass def check_version():