From e188f40058b18c9596a333ace09109162fb3f5ca Mon Sep 17 00:00:00 2001 From: Cedric Koch-Hofer <94527853+knard-intel@users.noreply.github.com> Date: Thu, 24 Feb 2022 13:22:47 +0100 Subject: [PATCH] DAOS-9906 cart: remove leftover build files (#8221) Remove build files from when cart was a standalone repo. Also fix files with inconsistent copyright style disabling pre-commit git hooks and update pre-commit git hooks to support yaml and sh source files. Signed-off-by: Cedric Koch-Hofer --- Jenkinsfile | 2 +- LICENSE | 2 +- NOTICE | 2 +- debian/copyright | 2 +- ftest.sh | 2 +- mkdocs.yml | 2 +- site_scons/build_info/__init__.py | 2 +- site_scons/build_info/base.py | 2 +- site_scons/components/__init__.py | 2 +- site_scons/env_modules.py | 2 +- site_scons/prereq_tools/__init__.py | 2 +- site_scons/prereq_tools/base.py | 2 +- site_scons/prereq_tools/mocked_tests.py | 2 +- site_scons/site_tools/extra/__init__.py | 2 +- site_scons/site_tools/extra/extra.py | 2 +- site_scons/site_tools/protoc/__init__.py | 2 +- src/cart/Jenkinsfile | 1358 ----------------- src/cart/LICENSE | 36 - src/cart/NOTICE | 3 - src/cart/crt_hlct.c | 2 +- src/cart/multi-node-test.sh | 2 +- src/cart/utils/build_cart.sh | 2 +- src/cart/utils/check_modules.sh | 2 +- src/cart/utils/rpms/Makefile | 41 - src/cart/utils/rpms/debian/cart-docs.docs | 0 src/cart/utils/rpms/debian/cart-tests.dirs | 2 - src/cart/utils/rpms/debian/cart-tests.install | 3 - src/cart/utils/rpms/debian/cart.dirs | 3 - src/cart/utils/rpms/debian/cart.install | 6 - src/cart/utils/rpms/debian/changelog | 194 --- src/cart/utils/rpms/debian/compat | 1 - src/cart/utils/rpms/debian/control | 77 - src/cart/utils/rpms/debian/copyright | 65 - src/cart/utils/rpms/debian/libcart-dev.dirs | 2 - .../utils/rpms/debian/libcart-dev.install | 4 - src/cart/utils/rpms/debian/libcart4.dirs | 1 - src/cart/utils/rpms/debian/libcart4.install | 1 - src/cart/utils/rpms/debian/rules | 87 -- src/cart/utils/rpms/debian/source/format | 1 - .../utils/rpms/packaging/Dockerfile.centos.7 | 34 - .../utils/rpms/packaging/Dockerfile.mockbuild | 31 - .../rpms/packaging/Dockerfile.ubuntu.18.04 | 29 - .../rpms/packaging/Dockerfile.ubuntu.rolling | 29 - .../rpms/packaging/Makefile_packaging.mk | 490 ------ src/cart/utils/run_test.sh | 2 +- src/cart/utils/setup_local.sh | 2 +- src/cart/utils/test_cart_lib.sh | 2 +- src/common/lru.c | 2 +- src/include/daos/lru.h | 2 +- src/rdb/raft_tests/raft_tests.py | 2 +- src/tests/ftest/cart/SConscript | 2 +- src/tests/ftest/cart/util/cart_logparse.py | 2 +- src/tests/ftest/cart/util/cart_logtest.py | 2 +- src/tests/ftest/scripts/cleanup_nodes.sh | 2 +- src/tests/ftest/scripts/main.sh | 2 +- src/tests/ftest/scripts/post_process_xml.sh | 2 +- src/tests/ftest/scripts/pre_clean_nodes.sh | 2 +- src/tests/ftest/scripts/setup_nodes.sh | 2 +- utils/certs/gen_certificates.sh | 2 +- utils/check_modules.sh | 2 +- utils/completion/daos.bash | 2 +- utils/docker/Dockerfile.centos.7 | 2 +- utils/docker/Dockerfile.centos.8 | 2 +- utils/docker/Dockerfile.checkpatch | 2 +- utils/docker/Dockerfile.leap.15 | 2 +- utils/docker/Dockerfile.ubuntu.20.04 | 2 +- utils/docker/vcluster/.env | 2 +- .../docker/vcluster/daos-admin/el8/Dockerfile | 2 +- .../docker/vcluster/daos-base/el8/Dockerfile | 2 +- .../vcluster/daos-client/el8/Dockerfile | 2 +- .../vcluster/daos-server/el8/Dockerfile | 2 +- utils/docker/vcluster/docker-compose.yml | 2 +- utils/githooks/pre-commit | 43 +- utils/sl/check_script.py | 2 +- utils/sl/fake_scons/SCons/Action/__init__.py | 2 +- utils/sl/fake_scons/SCons/Builder/__init__.py | 2 +- utils/sl/fake_scons/SCons/Errors/__init__.py | 2 +- utils/sl/fake_scons/SCons/Script/__init__.py | 2 +- utils/sl/fake_scons/SCons/Subst/__init__.py | 2 +- .../sl/fake_scons/SCons/Variables/__init__.py | 2 +- .../sl/fake_scons/SCons/Warnings/__init__.py | 2 +- utils/sl/fake_scons/SCons/__init__.py | 2 +- utils/sl/setup_local.sh | 2 +- 83 files changed, 93 insertions(+), 2564 deletions(-) delete mode 100755 src/cart/Jenkinsfile delete mode 100644 src/cart/LICENSE delete mode 100644 src/cart/NOTICE delete mode 100644 src/cart/utils/rpms/Makefile delete mode 100644 src/cart/utils/rpms/debian/cart-docs.docs delete mode 100644 src/cart/utils/rpms/debian/cart-tests.dirs delete mode 100644 src/cart/utils/rpms/debian/cart-tests.install delete mode 100644 src/cart/utils/rpms/debian/cart.dirs delete mode 100644 src/cart/utils/rpms/debian/cart.install delete mode 100644 src/cart/utils/rpms/debian/changelog delete mode 100644 src/cart/utils/rpms/debian/compat delete mode 100644 src/cart/utils/rpms/debian/control delete mode 100644 src/cart/utils/rpms/debian/copyright delete mode 100644 src/cart/utils/rpms/debian/libcart-dev.dirs delete mode 100644 src/cart/utils/rpms/debian/libcart-dev.install delete mode 100644 src/cart/utils/rpms/debian/libcart4.dirs delete mode 100644 src/cart/utils/rpms/debian/libcart4.install delete mode 100755 src/cart/utils/rpms/debian/rules delete mode 100644 src/cart/utils/rpms/debian/source/format delete mode 100644 src/cart/utils/rpms/packaging/Dockerfile.centos.7 delete mode 100644 src/cart/utils/rpms/packaging/Dockerfile.mockbuild delete mode 100644 src/cart/utils/rpms/packaging/Dockerfile.ubuntu.18.04 delete mode 100644 src/cart/utils/rpms/packaging/Dockerfile.ubuntu.rolling delete mode 100644 src/cart/utils/rpms/packaging/Makefile_packaging.mk diff --git a/Jenkinsfile b/Jenkinsfile index fe048737e9a..70e14542c16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!/usr/bin/groovy -/* Copyright (C) 2019-2022 Intel Corporation +/* Copyright 2019-2022 Intel Corporation * All rights reserved. * * This file is part of the DAOS Project. It is subject to the license terms diff --git a/LICENSE b/LICENSE index 05004af0093..2403a0097f1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2021-2022 Intel Corporation. +Copyright 2021-2022 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent diff --git a/NOTICE b/NOTICE index 77d0ed095b1..4e5430e3736 100644 --- a/NOTICE +++ b/NOTICE @@ -1,2 +1,2 @@ DAOS I/O Stack -Copyright (c) 2015-2020, Intel Corporation +Copyright 2015-2022 Intel Corporation diff --git a/debian/copyright b/debian/copyright index f252ee9950e..73908c055bb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: https://github.com/daos-stack/daos Files: * Copyright: Copyright 2016-2022 Intel Corporation License: BSD-2-Clause-Patent - Copyright (C) 2016-2022 Intel Corporation + Copyright 2016-2022 Intel Corporation All rights reserved. . Redistribution and use in source and binary forms, with or without diff --git a/ftest.sh b/ftest.sh index ad23e2c4cd1..a17711c5ba9 100755 --- a/ftest.sh +++ b/ftest.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2019-2020 Intel Corporation +# Copyright 2019-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/mkdocs.yml b/mkdocs.yml index eeee12ec044..0bbea707730 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,7 +6,7 @@ site_author: DAOS Project # Repository repo_name: daos-stack/daos repo_url: https://github.com/daos-stack/daos -copyright: Copyright © 2016 - 2022 Intel Corporation +copyright: Copyright 2016-2022 Intel Corporation # Theme theme: diff --git a/site_scons/build_info/__init__.py b/site_scons/build_info/__init__.py index 37cd4780403..99cf59fc5cc 100644 --- a/site_scons/build_info/__init__.py +++ b/site_scons/build_info/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/build_info/base.py b/site_scons/build_info/base.py index e1780b45835..eaeb7f61484 100644 --- a/site_scons/build_info/base.py +++ b/site_scons/build_info/base.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/components/__init__.py b/site_scons/components/__init__.py index a524e3e8eb8..54d89ebd112 100644 --- a/site_scons/components/__init__.py +++ b/site_scons/components/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2016-2020 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/env_modules.py b/site_scons/env_modules.py index 270b32791df..b616b6befd9 100644 --- a/site_scons/env_modules.py +++ b/site_scons/env_modules.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Copyright (c) 2019-2020 Intel Corporation +# Copyright 2019-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/prereq_tools/__init__.py b/site_scons/prereq_tools/__init__.py index 20a6c84c63c..9f53d3af08f 100644 --- a/site_scons/prereq_tools/__init__.py +++ b/site_scons/prereq_tools/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/prereq_tools/base.py b/site_scons/prereq_tools/base.py index 73cf7f6577a..90c6567c8c1 100644 --- a/site_scons/prereq_tools/base.py +++ b/site_scons/prereq_tools/base.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2016-2020 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/prereq_tools/mocked_tests.py b/site_scons/prereq_tools/mocked_tests.py index 94d646a0f72..03ef83789f4 100644 --- a/site_scons/prereq_tools/mocked_tests.py +++ b/site_scons/prereq_tools/mocked_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2017 Intel Corporation +# Copyright 2017-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/site_tools/extra/__init__.py b/site_scons/site_tools/extra/__init__.py index 61b6c8958de..e206c02c8ba 100644 --- a/site_scons/site_tools/extra/__init__.py +++ b/site_scons/site_tools/extra/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2018 Intel Corporation +# Copyright 2018-2022 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/site_tools/extra/extra.py b/site_scons/site_tools/extra/extra.py index bf36627ee67..0eb84ce5076 100644 --- a/site_scons/site_tools/extra/extra.py +++ b/site_scons/site_tools/extra/extra.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2018-2019 Intel Corporation +# Copyright 2018-2022 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/site_scons/site_tools/protoc/__init__.py b/site_scons/site_tools/protoc/__init__.py index f2024244ec5..12e537ba444 100644 --- a/site_scons/site_tools/protoc/__init__.py +++ b/site_scons/site_tools/protoc/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2018 Intel Corporation +# Copyright 2018-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/src/cart/Jenkinsfile b/src/cart/Jenkinsfile deleted file mode 100755 index b0f6fe46527..00000000000 --- a/src/cart/Jenkinsfile +++ /dev/null @@ -1,1358 +0,0 @@ -#!/usr/bin/groovy -/* Copyright (C) 2019-2020 Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted for any purpose (including commercial purposes) - * provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions, and the following disclaimer in the - * documentation and/or materials provided with the distribution. - * - * 3. In addition, redistributions of modified forms of the source or binary - * code must carry prominent notices stating that the original code was - * changed and the date of the change. - * - * 4. All publications or advertising materials mentioning features or use of - * this software are asked, but not required, to acknowledge that it was - * developed by Intel Corporation and credit the contributors. - * - * 5. Neither the name of Intel Corporation, nor the name of any Contributor - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -// To use a test branch (i.e. PR) until it lands to master -// I.e. for testing library changes -//@Library(value="pipeline-lib@your_branch") _ - -def arch = "-Linux" -def sanitized_JOB_NAME = JOB_NAME.toLowerCase().replaceAll('/', '-').replaceAll('%2f', '-') - -def component_repos = "" -def cart_repo = "cart@${env.BRANCH_NAME}:${env.BUILD_NUMBER}" -def cart_repos = component_repos + ' ' + cart_repo -//def cart_rpms = "openpa libfabric mercury" -// don't need to install any RPMs for testing yet -def cart_rpms = "openmpi3" - -// bail out of branch builds that are not on a whitelist -if (!env.CHANGE_ID && - (env.BRANCH_NAME != "weekly-testing" && - env.BRANCH_NAME != "master" && - env.BRANCH_NAME != "daos_devel1" && - env.BRANCH_NAME != "daos_devel")) { - currentBuild.result = 'SUCCESS' - return -} - -pipeline { - agent { label 'lightweight' } - - triggers { - cron(env.BRANCH_NAME == 'master' ? '0 0 * * *' : '') - } - - environment { - GITHUB_USER = credentials('daos-jenkins-review-posting') - BAHTTPS_PROXY = "${env.HTTP_PROXY ? '--build-arg HTTP_PROXY="' + env.HTTP_PROXY + '" --build-arg http_proxy="' + env.HTTP_PROXY + '"' : ''}" - BAHTTP_PROXY = "${env.HTTP_PROXY ? '--build-arg HTTPS_PROXY="' + env.HTTPS_PROXY + '" --build-arg https_proxy="' + env.HTTPS_PROXY + '"' : ''}" - UID = sh(script: "id -u", returnStdout: true) - BUILDARGS = "$env.BAHTTP_PROXY $env.BAHTTPS_PROXY " + - "--build-arg NOBUILD=1 --build-arg UID=$env.UID " + - "--build-arg JENKINS_URL=$env.JENKINS_URL " + - "--build-arg CACHEBUST=${currentBuild.startTimeInMillis}" - QUICKBUILD = sh(script: "git show -s --format=%B | grep \"^Quick-build: true\"", - returnStatus: true) - SSH_KEY_ARGS="-ici_key" - CLUSH_ARGS="-o$SSH_KEY_ARGS" - } - - options { - // preserve stashes so that jobs can be started at the test stage - preserveStashes(buildCount: 5) - } - - stages { - stage('Cancel Previous Builds') { - when { changeRequest() } - steps { - cancelPreviousBuilds() - } - } - stage('Pre-build') { - when { - beforeAgent true - allOf { - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - expression { return env.QUICKBUILD == '1' } - } - } - parallel { - stage('checkpatch') { - agent { - dockerfile { - filename 'Dockerfile.centos.7' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS' - } - } - steps { - checkPatch user: GITHUB_USER_USR, - password: GITHUB_USER_PSW, - ignored_files: "src/control/vendor/*" - } - post { - always { - archiveArtifacts artifacts: 'pylint.log', allowEmptyArchive: true - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - /* temporarily moved into stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'pre-build/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'pre-build/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'pre-build/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - } - } - stage('Build') { - /* Don't use failFast here as whilst it avoids using extra resources - * and gives faster results for PRs it's also on for master where we - * do want complete results in the case of partial failure - */ - //failFast true - when { - beforeAgent true - // expression { skipTest != true } - expression { ! commitPragma(pragma: 'Skip-build').contains('true') } - } - parallel { - stage('Build RPM on CentOS 7') { - when { - beforeAgent true - allOf { - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.mockbuild' - dir 'utils/rpms/packaging' - label 'docker_runner' - additionalBuildArgs '--build-arg UID=$(id -u) --build-arg JENKINS_URL=' + - env.JENKINS_URL - args '--group-add mock --cap-add=SYS_ADMIN --privileged=true' - } - } - steps { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: "build" + "/" + env.STAGE_NAME, - status: "PENDING" - checkoutScm withSubmodules: true - sh label: env.STAGE_NAME, - script: '''rm -rf artifacts/centos7/ - mkdir -p artifacts/centos7/ - if git show -s --format=%B | grep "^Skip-build: true"; then - exit 0 - fi - make CHROOT_NAME="epel-7-x86_64" -C utils/rpms chrootbuild''' - } - post { - success { - sh label: "Build Log", - script: '''mockroot=/var/lib/mock/epel-7-x86_64 - (cd $mockroot/result/ && - cp -r . $OLDPWD/artifacts/centos7/) - createrepo artifacts/centos7/ - cat $mockroot/result/{root,build}.log''' - publishToRepository product: 'cart', - format: 'yum', - maturity: 'stable', - tech: 'el-7', - repo_dir: 'artifacts/centos7/' - stepResult name: env.STAGE_NAME, context: "build", - result: "SUCCESS" - } - unstable { - stepResult name: env.STAGE_NAME, context: "build", - result: "UNSTABLE" - } - failure { - stepResult name: env.STAGE_NAME, context: "build", - result: "FAILURE" - } - unsuccessful { - sh label: "Build Log", - script: '''mockroot=/var/lib/mock/epel-7-x86_64 - cat $mockroot/result/{root,build}.log \ - 2>/dev/null || true - artdir=$PWD/artifacts/centos7 - if srpms=$(ls _topdir/SRPMS/*); then - cp -af $srpms $artdir - fi - (if cd $mockroot/result/; then - cp -r . $artdir - fi)''' - } - cleanup { - archiveArtifacts artifacts: 'artifacts/centos7/**' - } - } - } - stage('Build RPM on Leap 15') { - when { - beforeAgent true - allOf { - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.mockbuild' - dir 'utils/rpms/packaging' - label 'docker_runner' - args '--privileged=true' - additionalBuildArgs '--build-arg UID=$(id -u) --build-arg JENKINS_URL=' + - env.JENKINS_URL - args '--group-add mock --cap-add=SYS_ADMIN --privileged=true' - } - } - steps { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: "build" + "/" + env.STAGE_NAME, - status: "PENDING" - checkoutScm withSubmodules: true - catchError(stageResult: 'UNSTABLE', buildResult: 'SUCCESS') { - sh label: env.STAGE_NAME, - script: '''rm -rf artifacts/leap15/ - mkdir -p artifacts/leap15/ - if git show -s --format=%B | grep "^Skip-build: true"; then - exit 0 - fi - if ! make CHROOT_NAME="opensuse-leap-15.1-x86_64" -C utils/rpms chrootbuild; then - cp /etc/mock/opensuse-leap-15.1-x86_64.cfg artifacts/leap15/; - exit 1 - fi''' - } - } - post { - success { - sh label: "Build Log", - script: '''mockroot=/var/lib/mock/opensuse-leap-15.1-x86_64 - (cd $mockroot/result/ && - cp -r . $OLDPWD/artifacts/leap15/) - createrepo artifacts/leap15/ - rpm --qf %{version}-%{release}.%{arch} -qp artifacts/centos7/cart-*.x86_64.rpm > leap15-rpm-version - cat $mockroot/result/{root,build}.log''' - stash name: 'Leap-rpm-version', includes: 'leap15-rpm-version' - publishToRepository product: 'cart', - format: 'yum', - maturity: 'stable', - tech: 'leap-15', - repo_dir: 'artifacts/leap15/' - stepResult name: env.STAGE_NAME, context: "build", - result: "SUCCESS" - } - unstable { - stepResult name: env.STAGE_NAME, context: "build", - result: "UNSTABLE" - } - failure { - stepResult name: env.STAGE_NAME, context: "build", - result: "FAILURE" - } - unsuccessful { - sh label: "Build Log", - script: '''mockroot=/var/lib/mock/opensuse-leap-15.1-x86_64 - cat $mockroot/result/{root,build}.log \ - 2>/dev/null || true - artdir=$PWD/artifacts/leap15 - if srpms=$(ls _topdir/SRPMS/*); then - cp -af $srpms $artdir - fi - (if cd $mockroot/result/; then - cp -r . $artdir - fi)''' - } - cleanup { - archiveArtifacts artifacts: 'artifacts/leap15/**' - } - } - } - stage('Build DEB on Ubuntu 18.04') { - when { - expression { false } - } - agent { - dockerfile { - filename 'Dockerfile.ubuntu.18.04' - dir 'utils/rpms/packaging' - label 'docker_runner' - additionalBuildArgs '--build-arg UID=$(id -u) ' + - ' --build-arg JENKINS_URL=' + env.JENKINS_URL + - ' --build-arg CACHEBUST=' + - currentBuild.startTimeInMillis - } - } - steps { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: "build" + "/" + env.STAGE_NAME, - status: "PENDING" - checkoutScm withSubmodules: true - sh label: env.STAGE_NAME, - script: '''rm -rf artifacts/ubuntu18.04/ - mkdir -p artifacts/ubuntu18.04/ - : "${DEBEMAIL:="$env.DAOS_EMAIL"}" - : "${DEBFULLNAME:="$env.DAOS_FULLNAME"}" - export DEBEMAIL - export DEBFULLNAME - make -C utils/rpms debs''' - } - post { - success { - sh '''ln -v \ - _topdir/BUILD/*{.build,.changes,.deb,.dsc,.gz,.xz} \ - artifacts/ubuntu18.04/ - pushd artifacts/ubuntu18.04/ - dpkg-scanpackages . /dev/null | \ - gzip -9c > Packages.gz - popd''' - archiveArtifacts artifacts: 'artifacts/ubuntu18.04/**' - stepResult name: env.STAGE_NAME, context: "build", - result: "SUCCESS" - } - unsuccessful { - sh script: "cat _topdir/BUILD/*.build", - returnStatus: true - archiveArtifacts artifacts: 'artifacts/ubuntu18.04/**' - stepResult name: env.STAGE_NAME, context: "build", - result: "UNSTABLE" - } - } - } - stage('Build master CentOS 7') { - when { beforeAgent true - branch 'master' } - agent { - dockerfile { - filename 'Dockerfile.centos.7' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS' - } - } - steps { - sconsBuild(scons_exe: "scons-3", - clean: "_build.external${arch}", - scons_args: '--build-config=utils/build-master.config') - // this really belongs in the test stage CORCI-530 - sh '''scons-3 utest --utest-mode=memcheck - mv build/Linux/src/utest{,_valgrind} - scons-3 utest''' - stash name: 'CentOS-master-install', includes: 'install/**' - stash name: 'CentOS-master-build-vars', includes: ".build_vars${arch}.*" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-master-centos7", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - archiveArtifacts artifacts: '''build/Linux/src/utest_valgrind/utest.log, - build/Linux/src/utest_valgrind/test_output, - build/Linux/src/utest/utest.log, - build/Linux/src/utest/test_output''' - } - unsuccessful { - sh "mv config${arch}.log config.log-master" - archiveArtifacts artifacts: 'config.log-master' - } - } - } - stage('Build on CentOS 7') { - agent { - dockerfile { - filename 'Dockerfile.centos.7' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + - '$BUILDARGS ' + - '--build-arg QUICKBUILD=' + env.QUICKBUILD + - ' --build-arg REPOS="' + component_repos + '"' - } - } - steps { - sconsBuild(scons_exe: "scons-3", - clean: "_build.external${arch}") - // this really belongs in the test stage CORCI-530 - sh '''scons-3 utest --utest-mode=memcheck - mv build/Linux/src/utest{,_valgrind} - scons-3 utest''' - stash name: 'CentOS-install', includes: 'install/**' - stash name: 'CentOS-build-vars', includes: ".build_vars${arch}.*" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-centos7", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - archiveArtifacts artifacts: '''build/Linux/src/utest_valgrind/utest.log, - build/Linux/src/utest_valgrind/test_output, - build/Linux/src/utest/utest.log, - build/Linux/src/utest/test_output''' - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - /* temporarily moved into stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - } - */ - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-centos7-gcc - fi""" - archiveArtifacts artifacts: 'config.log-centos7-gcc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on CentOS 7 with Clang') { - agent { - dockerfile { - filename 'Dockerfile.centos.7' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS' - } - } - steps { - sconsBuild(scons_exe: "scons-3", - clean: "_build.external${arch}", - COMPILER: "clang") - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-centos7-clang", - tools: [ clang(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-centos7-clang - fi""" - archiveArtifacts artifacts: 'config.log-centos7-clang', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Ubuntu 18.04') { - when { - beforeAgent true - branch 'master' - } - agent { - dockerfile { - filename 'Dockerfile.ubuntu.18.04' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-ubuntu18.04 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-ubuntu18", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-ubuntu18.04-gcc - fi""" - archiveArtifacts artifacts: 'config.log-ubuntu18.04-gcc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Ubuntu 18.04 with Clang') { - when { - beforeAgent true - allOf { - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.ubuntu.18.04' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-ubuntu18.04 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite", COMPILER: "clang" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-ubuntu18-clang", - tools: [ clang(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-ubuntu18.04-clang - fi""" - archiveArtifacts artifacts: 'config.log-ubuntu18.04-clang', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on SLES 12.3') { - when { - beforeAgent true - allOf { - expression { false } - environment name: 'SLES12_3_DOCKER', value: 'true' - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.sles.12.3' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-sles12.3 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite" - } - post { - always { - node('lightweight') { - /* Stack dumping for sles12sp3/leap42.3: - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-sles12.3", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - */ - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-sles12.3-gcc - fi""" - archiveArtifacts artifacts: 'config.log-sles12.3-gcc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Leap 42.3') { - when { - beforeAgent true - allOf { - expression { false } - environment name: 'LEAP42_3_DOCKER', value: 'true' - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.leap.42.3' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-leap42.3 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite" - } - post { - always { - node('lightweight') { - /* Stack dumping for sles12sp3/leap42.3: - recordIssues enabledForFailure: true, - aggregatingResults: false, - id: "analysis-leap42.3", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - */ - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-leap42.3-gcc - fi""" - archiveArtifacts artifacts: 'config.log-leap42.3-gcc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Leap 15') { - when { - beforeAgent true - branch 'master' - } - agent { - dockerfile { - filename 'Dockerfile.leap.15' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-leap15 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-leap15", - tools: [ gcc4(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-leap15-gcc - fi""" - archiveArtifacts artifacts: 'config.log-leap15-gcc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Leap 15 with Clang') { - when { - branch 'master' - } - agent { - dockerfile { - filename 'Dockerfile.leap.15' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-leap15 " + '$BUILDARGS' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite", COMPILER: "clang" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-leap15-clang", - tools: [ clang(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-leap15-clang - fi""" - archiveArtifacts artifacts: 'config.log-leap15-clang', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - stage('Build on Leap 15 with Intel-C') { - when { - beforeAgent true - allOf { - not { branch 'weekly-testing' } - expression { env.CHANGE_TARGET != 'weekly-testing' } - } - } - agent { - dockerfile { - filename 'Dockerfile.leap.15' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-leap15 " + '$BUILDARGS' - args '-v /opt/intel:/opt/intel' - } - } - steps { - sconsBuild clean: "_build.external${arch} .sconsign${arch}.dblite", COMPILER: "icc" - } - post { - always { - node('lightweight') { - recordIssues enabledForFailure: true, - aggregatingResults: true, - id: "analysis-leap15-intelc", - tools: [ intel(), cppCheck() ], - filters: [excludeFile('.*\\/_build\\.external-Linux\\/.*'), - excludeFile('_build\\.external-Linux\\/.*')] - } - /* when JENKINS-39203 is resolved, can probably use stepResult - here and remove the remaining post conditions - stepResult name: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - result: ${currentBuild.currentResult} - */ - } - success { - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'SUCCESS' - */ - sh "rm -rf _build.external${arch}" - } - unsuccessful { - sh """if [ -f config${arch}.log ]; then - mv config${arch}.log config.log-leap15-intelc - fi""" - archiveArtifacts artifacts: 'config.log-leap15-intelc', - allowEmptyArchive: true - /* temporarily moved into stepResult due to JENKINS-39203 - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'build/' + env.STAGE_NAME, - status: 'FAILURE' - */ - } - } - } - } - } - stage('Test') { - when { - beforeAgent true - // expression { skipTest != true } - expression { env.NO_CI_TESTING != 'true' } - expression { ! commitPragma(pragma: 'Skip-test').contains('true') } - } - parallel { - stage('Coverity on CentOS 7') { - // Eventually this will only run on Master builds. - // Unfortunately for now, a PR build could break - // the quickbuild, which would not be detected until - // the master build fails. -// when { -// beforeAgent true -// anyOf { -// branch 'master' -// not { -// // expression returns false on grep match -// expression { -// sh script: 'git show -s --format=%B |' + -// ' grep "^Coverity-test: true"', -// returnStatus: true -// } -// } -// } -// } - agent { - dockerfile { - filename 'Dockerfile.centos.7' - dir 'utils/docker' - label 'docker_runner' - additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + - '$BUILDARGS ' + - '--build-arg QUICKBUILD=0' + - ' --build-arg REPOS="' + cart_repos + '"' - } - } - steps { - sh "rm -f coverity/cart_coverity.tgz" - sconsBuild scons_exe: "scons-3", - coverity: "daos-stack/daos", - clean: "_build.external${arch}", - failure_artifacts: 'config.log-centos7-cov' - } - post { - success { - sh """rm -rf _build.external${arch} - mkdir -p coverity - rm -f coverity/* - if [ -e cov-int ]; then - tar czf coverity/cart_coverity.tgz cov-int - fi""" - archiveArtifacts artifacts: 'coverity/cart_coverity.tgz', - allowEmptyArchive: true - } - unsuccessful { - sh """mkdir -p coverity - if [ -f config${arch}.log ]; then - mv config${arch}.log coverity/config.log-centos7-cov - fi - if [ -f cov-int/build-log.txt ]; then - mv cov-int/build-log.txt coverity/cov-build-log.txt - fi""" - archiveArtifacts artifacts: 'coverity/cov-build-log.txt', - allowEmptyArchive: true - archiveArtifacts artifacts: 'coverity/config.log-centos7-cov', - allowEmptyArchive: true - } - } - } - stage('Single-node') { - when { - beforeAgent true - expression { ! commitPragma(pragma: 'Skip-test-single-node').contains('true') } - } - agent { - label 'ci_vm1' - } - steps { - provisionNodes NODELIST: env.NODELIST, - node_count: 1, - snapshot: true, - inst_repos: component_repos, - inst_rpms: cart_rpms - timeout (time: 30, unit: 'MINUTES') { - runTest stashes: [ 'CentOS-install', 'CentOS-build-vars' ], - script: '''export PDSH_SSH_ARGS_APPEND="-i ci_key" - export CART_TEST_MODE=native - bash -x ./multi-node-test.sh 1 ''' + - env.NODELIST + ''' one_node''', - junit_files: "install/Linux/TESTING/avocado/job-results/CART_1node/*/*.xml" - } - } - post { - always { - sh '''rm -rf install/Linux/TESTING/avocado/job-results/CART_1node/*/html/ - if [ -n "$STAGE_NAME" ]; then - rm -rf "$STAGE_NAME/" - mkdir "$STAGE_NAME/" - mv install/Linux/TESTING/avocado/job-results/CART_1node/* \ - "$STAGE_NAME/" || true - mv install/Linux/TESTING/testLogs-1_node \ - "$STAGE_NAME/" || true - else - echo "The STAGE_NAME environment variable is missing!" - false - fi''' - junit env.STAGE_NAME + '/*/results.xml' - archiveArtifacts artifacts: env.STAGE_NAME + '/**' - } - /* temporarily moved into runTest->stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - stage('Single-node-valgrind') { - when { - beforeAgent true - expression { ! commitPragma(pragma: 'Skip-test-single-node-valgrind').contains('true') } - } - agent { - label 'ci_vm1' - } - steps { - provisionNodes NODELIST: env.NODELIST, - node_count: 1, - snapshot: true, - inst_repos: component_repos, - inst_rpms: cart_rpms - timeout (time: 30, unit: 'MINUTES') { - runTest stashes: [ 'CentOS-install', 'CentOS-build-vars' ], - script: '''export PDSH_SSH_ARGS_APPEND="-i ci_key" - export CART_TEST_MODE=memcheck - bash -x ./multi-node-test.sh 1 ''' + - env.NODELIST + ''' one_node''', - junit_files: "install/Linux/TESTING/avocado/job-results/CART_1vgdnode/*/*.xml" - } - } - post { - always { - sh '''rm -rf install/Linux/TESTING/avocado/job-results/CART_1vgdnode/*/html/ - if [ -n "$STAGE_NAME" ]; then - rm -rf "$STAGE_NAME/" - mkdir "$STAGE_NAME/" - mv install/Linux/TESTING/avocado/job-results/CART_1vgdnode/* \ - "$STAGE_NAME/" || true - mv install/Linux/TESTING/testLogs-1vgd_node \ - "$STAGE_NAME/" || true - else - echo "The STAGE_NAME environment variable is missing!" - false - fi''' - publishValgrind ( - failBuildOnInvalidReports: true, - failBuildOnMissingReports: true, - failThresholdDefinitelyLost: '0', - failThresholdInvalidReadWrite: '0', - failThresholdTotal: '0', - pattern: '**/*.memcheck', - publishResultsForAbortedBuilds: false, - publishResultsForFailedBuilds: false, - sourceSubstitutionPaths: '', - unstableThresholdDefinitelyLost: '', - unstableThresholdInvalidReadWrite: '', - unstableThresholdTotal: '' - ) - junit env.STAGE_NAME + '/*/results.xml' - archiveArtifacts artifacts: env.STAGE_NAME + '/**' - } - /* temporarily moved into runTest->stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - stage('Two-node') { - when { - beforeAgent true - expression { ! commitPragma(pragma: 'Skip-test-two-node').contains('true') } - } - agent { - label 'ci_vm2' - } - steps { - provisionNodes NODELIST: env.NODELIST, - node_count: 2, - snapshot: true, - inst_repos: component_repos, - inst_rpms: cart_rpms - timeout (time: 30, unit: 'MINUTES') { - runTest stashes: [ 'CentOS-install', 'CentOS-build-vars' ], - script: '''export PDSH_SSH_ARGS_APPEND="-i ci_key" - export CART_TEST_MODE=none - bash -x ./multi-node-test.sh 2 ''' + - env.NODELIST + ''' two_node''', - junit_files: "install/Linux/TESTING/avocado/job-results/CART_2node/*/*.xml" - } - } - post { - always { - sh '''rm -rf install/Linux/TESTING/avocado/job-results/CART_2node/*/html/ - if [ -n "$STAGE_NAME" ]; then - rm -rf "$STAGE_NAME/" - mkdir "$STAGE_NAME/" - mv install/Linux/TESTING/avocado/job-results/CART_2node/* \ - "$STAGE_NAME/" || true - mv install/Linux/TESTING/testLogs-2_node \ - "$STAGE_NAME/" || true - else - echo "The STAGE_NAME environment variable is missing!" - false - fi''' - junit env.STAGE_NAME + '/*/results.xml' - archiveArtifacts artifacts: env.STAGE_NAME + '/**' - } - /* temporarily moved into runTest->stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - stage('Three-node') { - when { - beforeAgent true - expression { ! commitPragma(pragma: 'Skip-test-three-node').contains('true') } - } - agent { - label 'ci_vm3' - } - steps { - provisionNodes NODELIST: env.NODELIST, - node_count: 3, - snapshot: true, - inst_repos: component_repos, - inst_rpms: cart_rpms - timeout (time: 30, unit: 'MINUTES') { - runTest stashes: [ 'CentOS-install', 'CentOS-build-vars' ], - script: '''export PDSH_SSH_ARGS_APPEND="-i ci_key" - export CART_TEST_MODE=none - bash -x ./multi-node-test.sh 3 ''' + - env.NODELIST + ''' three_node''', - junit_files: "install/Linux/TESTING/avocado/job-results/CART_3node/*/*.xml" - } - } - post { - always { - sh '''rm -rf install/Linux/TESTING/avocado/job-results/CART_3node/*/html/ - if [ -n "$STAGE_NAME" ]; then - rm -rf "$STAGE_NAME/" - mkdir "$STAGE_NAME/" - mv install/Linux/TESTING/avocado/job-results/CART_3node/* \ - "$STAGE_NAME/" || true - mv install/Linux/TESTING/testLogs-3_node \ - "$STAGE_NAME/" || true - else - echo "The STAGE_NAME environment variable is missing!" - false - fi''' - junit env.STAGE_NAME + '/*/results.xml' - archiveArtifacts artifacts: env.STAGE_NAME + '/**' - } - /* temporarily moved into runTest->stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - stage('Five-node') { - when { - beforeAgent true - expression { ! commitPragma(pragma: 'Skip-test-five-node').contains('true') } - } - agent { - label 'ci_vm5' - } - steps { - provisionNodes NODELIST: env.NODELIST, - node_count: 5, - snapshot: true, - inst_repos: component_repos, - inst_rpms: cart_rpms - timeout (time: 30, unit: 'MINUTES') { - runTest stashes: [ 'CentOS-install', 'CentOS-build-vars' ], - script: '''export PDSH_SSH_ARGS_APPEND="-i ci_key" - export CART_TEST_MODE=none - bash -x ./multi-node-test.sh 5 ''' + - env.NODELIST + ''' five_node''', - junit_files: "install/Linux/TESTING/avocado/job-results/CART_5node/*/*.xml" - } - } - post { - always { - sh '''rm -rf install/Linux/TESTING/avocado/job-results/CART_5node/*/html/ - if [ -n "$STAGE_NAME" ]; then - rm -rf "$STAGE_NAME/" - mkdir "$STAGE_NAME/" - mv install/Linux/TESTING/avocado/job-results/CART_5node/* \ - "$STAGE_NAME/" || true - mv install/Linux/TESTING/testLogs-5_node \ - "$STAGE_NAME/" || true - else - echo "The STAGE_NAME environment variable is missing!" - false - fi''' - junit env.STAGE_NAME + '/*/results.xml' - archiveArtifacts artifacts: env.STAGE_NAME + '/**' - } - /* temporarily moved into runTest->stepResult due to JENKINS-39203 - success { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'SUCCESS' - } - unstable { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'FAILURE' - } - failure { - githubNotify credentialsId: 'daos-jenkins-commit-status', - description: env.STAGE_NAME, - context: 'test/' + env.STAGE_NAME, - status: 'ERROR' - } - */ - } - } - } - } - } -} diff --git a/src/cart/LICENSE b/src/cart/LICENSE deleted file mode 100644 index 24505b29737..00000000000 --- a/src/cart/LICENSE +++ /dev/null @@ -1,36 +0,0 @@ -Copyright (C) 2016-2020 Intel Corporation -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted for any purpose (including commercial purposes) -provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions, and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions, and the following disclaimer in the - documentation and/or materials provided with the distribution. - -3. In addition, redistributions of modified forms of the source or binary - code must carry prominent notices stating that the original code was - changed and the date of the change. - -4. All publications or advertising materials mentioning features or use of - this software are asked, but not required, to acknowledge that it was - developed by Intel Corporation and credit the contributors. - -5. Neither the name of Intel Corporation, nor the name of any Contributor - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/cart/NOTICE b/src/cart/NOTICE deleted file mode 100644 index 6a4b6945d9b..00000000000 --- a/src/cart/NOTICE +++ /dev/null @@ -1,3 +0,0 @@ -Collective and RPC Transport -Gurt Useful Routines and Types -Copyright (c) 2015-2019, Intel Corporation diff --git a/src/cart/crt_hlct.c b/src/cart/crt_hlct.c index 21d805191f7..528ca5397a6 100644 --- a/src/cart/crt_hlct.c +++ b/src/cart/crt_hlct.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Intel Corporation +/* Copyright 2020-2022 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/cart/multi-node-test.sh b/src/cart/multi-node-test.sh index 2ba31802beb..538550c079d 100755 --- a/src/cart/multi-node-test.sh +++ b/src/cart/multi-node-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2019 Intel Corporation +# Copyright 2019-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/cart/utils/build_cart.sh b/src/cart/utils/build_cart.sh index 5d73d47c74c..50b13486fce 100755 --- a/src/cart/utils/build_cart.sh +++ b/src/cart/utils/build_cart.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/cart/utils/check_modules.sh b/src/cart/utils/check_modules.sh index 6163493a7b0..b0e17a4b1a7 100755 --- a/src/cart/utils/check_modules.sh +++ b/src/cart/utils/check_modules.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2016-2019 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/cart/utils/rpms/Makefile b/src/cart/utils/rpms/Makefile deleted file mode 100644 index ba422905735..00000000000 --- a/src/cart/utils/rpms/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -NAME := cart -SRC_EXT := gz -SOURCE = $(NAME)-$(VERSION).tar.$(SRC_EXT) -PATCHES = scons_local-$(VERSION).tar.$(SRC_EXT) - -SLES_12_PR_REPOS := scons -LEAP_42_PR_REPOS := scons -LEAP_42_REPOS := https://download.opensuse.org/repositories/science:/HPC/openSUSE_Leap_42.3 -SLES_12_REPOS := https://download.opensuse.org/repositories/science:/HPC/openSUSE_Leap_42.3 \ - https://download.opensuse.org/repositories/science:/HPC:/SLE12SP3_Missing/SLE_12_SP3/ \ - https://download.opensuse.org/repositories/devel:libraries:c_c++/SLE_12_SP3/ - -GIT_SHA1 := $(shell git rev-parse HEAD) -GIT_SHORT := $(shell git rev-parse --short HEAD) -GIT_NUM_COMMITS := $(shell git rev-list HEAD --count) - -BUILD_DEFINES := --define "%relval .$(GIT_NUM_COMMITS).g$(GIT_SHORT)" --define "%sha1 $(GIT_SHA1)" -RPM_BUILD_OPTIONS := $(BUILD_DEFINES) -PACKAGING_CHECK_DIR := ../../../rpm/packaging - -dist: $(SOURCES) - -include packaging/Makefile_packaging.mk - -PACKAGING_CHECK_DIR ?= ../../../rpm/packaging - -scons_local-$(VERSION).tar.gz: FORCE - cd ../../scons_local && \ - git archive --format tar --prefix scons_local/ \ - -o $$OLDPWD/$(basename $@) HEAD ./ - rm -f $@ - gzip $(basename $@) - -$(NAME)-$(VERSION).tar.gz: FORCE - echo $@ - echo $(basename $@) - cd ../../ && \ - git archive --format tar --prefix $(NAME)-$(VERSION)/ \ - -o $$OLDPWD/$(basename $@) HEAD ./ - rm -f $@ - gzip $(basename $@) diff --git a/src/cart/utils/rpms/debian/cart-docs.docs b/src/cart/utils/rpms/debian/cart-docs.docs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/cart/utils/rpms/debian/cart-tests.dirs b/src/cart/utils/rpms/debian/cart-tests.dirs deleted file mode 100644 index e7f44b632c7..00000000000 --- a/src/cart/utils/rpms/debian/cart-tests.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/cart -usr/lib/daos/TESTING diff --git a/src/cart/utils/rpms/debian/cart-tests.install b/src/cart/utils/rpms/debian/cart-tests.install deleted file mode 100644 index cff61dff800..00000000000 --- a/src/cart/utils/rpms/debian/cart-tests.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/daos/TESTING/*/* -usr/lib/*/cart/multi-node-test.sh -usr/lib/*/cart/.build_vars-linux.sh diff --git a/src/cart/utils/rpms/debian/cart.dirs b/src/cart/utils/rpms/debian/cart.dirs deleted file mode 100644 index 48a4ec17e19..00000000000 --- a/src/cart/utils/rpms/debian/cart.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib/cart -usr/etc diff --git a/src/cart/utils/rpms/debian/cart.install b/src/cart/utils/rpms/debian/cart.install deleted file mode 100644 index ae945c5961e..00000000000 --- a/src/cart/utils/rpms/debian/cart.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/cart_ctl -usr/bin/*-cart_ctl -usr/bin/self_test -usr/bin/*-self_test -usr/lib/*/cart/utils/* -usr/etc/* diff --git a/src/cart/utils/rpms/debian/changelog b/src/cart/utils/rpms/debian/changelog deleted file mode 100644 index 5a7d987e578..00000000000 --- a/src/cart/utils/rpms/debian/changelog +++ /dev/null @@ -1,194 +0,0 @@ -cart (4.6.0-1) unstable; urgency=medium - [ Alexander Oganezov ] - * 4.6.0-1 version of CaRT - * crt_swim_init()/crt_swim_fini() APIs added - * CRT_FLAG_BIT_AUTO_SWIM_DISABLE flag added to crt_init() - - -- Alexander Oganezov Thu, 13 Feb 2020 16:53:01 +0000 - -cart (4.5.1-2) unstable; urgency=medium - [ Alexander Oganezov ] - * 4.5.1-2 version of CaRT - * mercury_version 2.0.0a1-0.3.git.c2c2628 - unrolled nameserver patch due to - verbs instability - - -- Alexander Oganezov Tue, 11 Feb 2020 16:53:01 +0000 - -cart (4.5.1-1) unstable; urgency=medium - [ Alexander Oganezov ] - * 4.5.1-1 version of CaRT - * Added support ofr D_LOG_TRUNCATE environment variable - - -- Alexander Oganezov Mon, 27 Jan 2020 16:53:01 +0000 - -cart (4.5.0-1) unstable; urgency=medium - [ Alexander Oganezov ] - * 4.5.0-1 version of CaRT - * crt_barrier() API and associated types removed - - -- Alexander Oganezov Sun, 19 Jan 2020 16:53:01 +0000 - -cart (4.4.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 4.4.0-1 version of CaRT - * New IV APIs added: crt_iv_namespace_priv_set/get - - -- Alexander Oganezov Tue, 14 Jan 2020 16:53:01 +0000 - -cart (4.3.1-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 4.3.1-1 version of CaRT - * ofi+verbs support removed. 'ofi+verbs;ofi_rxm' to be used instead - - -- Alexander Oganezov Thu, 26 Dec 2019 16:53:01 +0000 - -cart (4.3.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 4.3.0-1 version of CaRT - - -- Alexander Oganezov Mon, 16 Dec 2019 16:53:01 +0000 - -cart (4.2.0-1) unstable; urgency=medium - - [ Jeff Olivier ] - * 4.2.0-1 version of CaRT - * More updates to build to find mpi - - -- Jeff Olivier Sat, 14 Dec 2019 16:53:01 +0000 - -cart (4.1.0-1) unstable; urgency=medium - - [ Jeff Olivier ] - * 4.1.0-1 version of CaRT - * Removed explicit build of ompi and hwloc - - -- Jeff Olivier Wed, 11 Dec 2019 15:41:01 +0000 - -cart (4.0.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 4.0.0-1 version of CaRT - * PMIX support removed along with all associated code - - -- Alexander Oganezov Mon, 9 Dec 2019 19:27:01 +0000 - -cart (3.2.0-3) unstable; urgency=medium - - [ Alexander Oganezov ] - * 3.2.0-3 version of CaRT - * Restrict mercury to be version = 1.0.1-21 - - -- Alexander Oganezov Thu, 5 Dec 2019 19:27:01 +0000 - -cart (3.2.0-2) unstable; urgency=medium - - [ Alexander Oganezov ] - * 3.2.0-2 version of CaRT - * Restrict mercury to be < 1.0.1-21 - - -- Alexander Oganezov Tue, 3 Dec 2019 19:27:01 +0000 - -cart (3.2.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 3.2.0-1 version of CaRT - * New DER_GRPVER error code added - - -- Alexander Oganezov Thu, 21 Nov 2019 19:27:01 +0000 - -cart (3.1.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 3.1.0-1 version of CaRT - * New crt_group_version_set() API added - - -- Alexander Oganezov Tue, 19 Nov 2019 19:27:01 +0000 - -cart (3.0.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 3.0.0-1 version of CaRT - * IV namespace APIs changed - - -- Alexander Oganezov Wed, 13 Nov 2019 19:27:01 +0000 - -cart (2.1.0-1) unstable; urgency=medium - - [ Jeff Olivier ] - * 2.1.0-1 version of CaRT - * Add interface to register error codes with gurt - - -- Jeff Olivier Mon, 11 Nov 2019 19:27:01 +0000 - -cart (2.0.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 2.0.0-1 version of CaRT - * crt_group_primary_modify, crt_group_secondary_modify APIs changed. - - -- Alexander Oganezov Wed, 30 Oct 2019 16:22:44 +0000 - -cart (1.6.0-2) unstable; urgency=medium - [ Brian J. Murrell ] - * NOOP (RPM build updates) - - -- Brian J. Murrell Thu, 24 Oct 2019 10:28:27 -0400 - -cart (1.6.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 1.6.0-1 version of CaRT - - -- Alexander Oganezov Wed, 23 Oct 2019 16:22:44 +0000 - -cart (1.5.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 1.5.0 version of CaRT - - -- Alexander Oganezov Thu, 17 Oct 2019 16:22:44 +0000 - -cart (1.4.0-2) unstable; urgency=medium - - [ Alexander Oganezov ] - * 1.4.0-2 version of CaRT - - -- Alexander Oganezov Wed, 16 Oct 2019 16:22:44 +0000 - -cart (1.4.0-1) unstable; urgency=medium - - [ Ryon Jensen ] - * 1.4.0 version of CaRT - - -- Ryon Jensen Mon, 07 Oct 2019 16:22:44 +0000 - -cart (1.3.0-1) unstable; urgency=medium - - [ Dmitry Eremin ] - * 1.3.0 version of CaRT - - -- Dmitry Eremin Wed, 25 Sep 2019 22:20:44 +0000 - -cart (1.2.0-1) unstable; urgency=medium - - [ Jeffrey Olivier ] - * 1.2.0 version of CaRT - - -- Jeffrey Olivier Mon, 23 Sep 2019 14:20:44 +0000 - -cart (1.1.0-1) unstable; urgency=medium - - [ Alexander Oganezov ] - * 1.1.0 version of CaRT - - -- Alexander Oganezov Thu, 8 Aug 2019 18:54:44 +0000 - -cart (1.0.0-1) unstable; urgency=medium - - [ John Malmberg ] - * Experimental test build - - -- John Malmberg Thu, 20 Jun 2019 18:54:44 +0000 diff --git a/src/cart/utils/rpms/debian/compat b/src/cart/utils/rpms/debian/compat deleted file mode 100644 index f599e28b8ab..00000000000 --- a/src/cart/utils/rpms/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/src/cart/utils/rpms/debian/control b/src/cart/utils/rpms/debian/control deleted file mode 100644 index a6288fbdf12..00000000000 --- a/src/cart/utils/rpms/debian/control +++ /dev/null @@ -1,77 +0,0 @@ -Source: cart -Section: net -Priority: optional -Maintainer: daos-stack -Build-Depends: debhelper (>= 10), - dh-python, - libcmocka-dev, - libfabric-dev, - libhwloc-dev, - libopenmpi-dev, - libssl-dev, - libyaml-dev, - libmercury-dev (= 1.0.1-21), - scons, - uuid-dev -Standards-Version: 4.1.2 -Homepage: https://docs.daos.io/ -Vcs-Git: https://github.com/daos-stack/cart.git -Vcs-Browser: https://github.com/daos-stack/cart.git - -Package: cart -Section: net -Architecture: any -Multi-Arch: same -Depends: libcart4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, - openmpi-bin -Description: Collective and RPC Transport - CaRT is an open-source RPC transport layer for Big Data and Exascale - HPC. It supports both traditional P2P RPC delivering and collective RPC - which invokes the RPC at a group of target servers with a scalable - tree-based message propagating. - . - This package contains the Cart Utilities. - -Package: libcart-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: libcart4 (= ${binary:Version}), ${misc:Depends} -Description: Collective and RPC Transport - CaRT is an open-source RPC transport layer for Big Data and Exascale - HPC. It supports both traditional P2P RPC delivering and collective RPC - which invokes the RPC at a group of target servers with a scalable - tree-based message propagating. - . - This package is needed to compile programs against libcart. - It contains the header files and links needed for compiling. - - -Package: libcart4 -Section: libs -Architecture: any -Multi-Arch: same -Depends: libmercury1, libyaml-0-2, libuuid1, - ${shlibs:Depends}, ${misc:Depends} -Description: Collective and RPC Transport - CaRT is an open-source RPC transport layer for Big Data and Exascale - HPC. It supports both traditional P2P RPC delivering and collective RPC - which invokes the RPC at a group of target servers with a scalable - tree-based message propagating. - . - This package contains the shared libraries. - -Package: cart-tests -Architecture: any -Multi-Arch: same -Depends: cart (= ${binary:Version}), - python (>=2.7), python3, python-yaml, python3-yaml, - ${shlibs:Depends}, ${misc:Depends} -Description: Collective and RPC Transport - CaRT is an open-source RPC transport layer for Big Data and Exascale - HPC. It supports both traditional P2P RPC delivering and collective RPC - which invokes the RPC at a group of target servers with a scalable - tree-based message propagating. - . - This package contains unit tests - diff --git a/src/cart/utils/rpms/debian/copyright b/src/cart/utils/rpms/debian/copyright deleted file mode 100644 index 5b50a20afe5..00000000000 --- a/src/cart/utils/rpms/debian/copyright +++ /dev/null @@ -1,65 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: cart -Source: https://github.com/daos-stack/cart - -Files: * -Copyright: Copyright 2016-2019 Intel Corporation -License: Intel_Open_Source_License - Copyright (C) 2016-2019 Intel Corporation - All rights reserved. - . - Redistribution and use in source and binary forms, with or without - modification, are permitted for any purpose (including commercial purposes) - provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions, and the following disclaimer. - . - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions, and the following disclaimer in the - documentation and/or materials provided with the distribution. - . - 3. In addition, redistributions of modified forms of the source or binary - code must carry prominent notices stating that the original code was - changed and the date of the change. - . - 4. All publications or advertising materials mentioning features or use of - this software are asked, but not required, to acknowledge that it was - developed by Intel Corporation and credit the contributors. - . - 5. Neither the name of Intel Corporation, nor the name of any Contributor - may be used to endorse or promote products derived from this software - without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2019 daos-stack -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - diff --git a/src/cart/utils/rpms/debian/libcart-dev.dirs b/src/cart/utils/rpms/debian/libcart-dev.dirs deleted file mode 100644 index 44188162ec7..00000000000 --- a/src/cart/utils/rpms/debian/libcart-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/src/cart/utils/rpms/debian/libcart-dev.install b/src/cart/utils/rpms/debian/libcart-dev.install deleted file mode 100644 index 19b7f43ccd2..00000000000 --- a/src/cart/utils/rpms/debian/libcart-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/cart/* -usr/include/gurt/* -usr/lib/*/lib*.so - diff --git a/src/cart/utils/rpms/debian/libcart4.dirs b/src/cart/utils/rpms/debian/libcart4.dirs deleted file mode 100644 index 68457717bd8..00000000000 --- a/src/cart/utils/rpms/debian/libcart4.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/src/cart/utils/rpms/debian/libcart4.install b/src/cart/utils/rpms/debian/libcart4.install deleted file mode 100644 index 3ddde584198..00000000000 --- a/src/cart/utils/rpms/debian/libcart4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff --git a/src/cart/utils/rpms/debian/rules b/src/cart/utils/rpms/debian/rules deleted file mode 100755 index 20dfbf5a22e..00000000000 --- a/src/cart/utils/rpms/debian/rules +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -name := cart -prefix := /usr -exec_prefix := $(prefix) -buildroot := debian/tmp -carthome := $(exec_prefix)/lib/$(DEB_BUILD_MULTIARCH)/$(name) - -SCONS = scons -DEB_SCONS_OPTIONS := --config=force USE_INSTALLED=all \ - PREFIX=$(buildroot)$(prefix) - -%: - dh $@ - -override_dh_auto_build: - if [ ! -e src/$(name)/_structures_from_macros_.h_orig ] ;then \ - cp src/$(name)/_structures_from_macros_.h \ - src/$(name)/_structures_from_macros_.h_orig ;fi - if [ ! -e src/SConscript_orig ] ; then \ - find . -name SConscript -exec cp -v '{}' '{}_orig' ';' ;fi - find . -name SConscript | \ - xargs sed -i -e '/AppendUnique(RPATH=.*)/d' - $(SCONS) $(DEB_SCONS_OPTIONS) - -override_dh_auto_clean: - $(SCONS) --clean - rm -rf build install - find . -name '*.pyc' -delete - rm -rf _build.external-Linux - rm -rf .sconf-temp-Linux - rm -f .sconsign-Linux.dblite - rm -f .build_vars-Linux.json .build_vars-Linux.sh - rm -f $(name)-Linux.conf - rm -f config-Linux.log - if [ -e src/$(name)/_structures_from_macros_.h_orig ] ;then \ - mv src/$(name)/_structures_from_macros_.h_orig \ - src/$(name)/_structures_from_macros_.h ;fi - if [ -e src/SConscript_orig ] ; then \ - find . -name SConscript -exec mv -v -f '{}_orig' '{}' ';' ;fi - dh_auto_clean - -# cp openmpi/include to work around bug until ompi dependency removed -# Need to save/restore src/cart/_structures_from_macros_.h -override_dh_auto_install: - if [ ! -e src/$(name)/_structures_from_macros_.h_orig ] ;then \ - cp src/$(name)/_structures_from_macros_.h \ - src/$(name)/_structures_from_macros_.h_orig ;fi - if [ ! -e src/SConscript_orig ] ; then \ - find . -name SConscript -exec cp -v '{}' '{}_orig' ';' ;fi - find . -name SConscript | \ - xargs sed -i -e '/AppendUnique(RPATH=.*)/d' - mkdir -p $(buildroot)$(prefix)/include - $(SCONS) $(DEB_SCONS_OPTIONS) install - find . -name src/SConscript -exec mv -v -f '{}_orig' '{}' ';' - sed -i -r -e s%.+$(buildroot)$(prefix)%$(prefix)%g \ - $(buildroot)$(prefix)/TESTING/.build_vars.* - for f in cart_ctl self_test ; do \ - mv $(buildroot)$(prefix)/bin/$$f \ - $(buildroot)$(prefix)/bin/$(DEB_BUILD_MULTIARCH)-$$f ; \ - ln -s $(DEB_BUILD_MULTIARCH)-$$f $(buildroot)$(prefix)/bin/$$f ;done - mkdir -p $(buildroot)$(carthome) - mkdir -p $(buildroot)$(prefix)/lib/$(DEB_BUILD_MULTIARCH) - cp -al multi-node-test.sh utils $(buildroot)$(carthome)/ - mv $(buildroot)$(prefix)/TESTING $(buildroot)$(carthome)/ - ln $(buildroot)$(carthome)/TESTING/.build_vars.sh \ - $(buildroot)$(carthome)/.build_vars-linux.sh - mv $(buildroot)$(prefix)/lib/lib*.so* \ - $(buildroot)$(prefix)/lib/$(DEB_BUILD_MULTIARCH)/ - rm -rf $(buildroot)$(carthome)/utils/docker - chmod 0644 $(buildroot)$(carthome)/TESTING/*/*.yaml - rm -rf build install - find . -name '*.pyc' -delete - diff --git a/src/cart/utils/rpms/debian/source/format b/src/cart/utils/rpms/debian/source/format deleted file mode 100644 index 163aaf8d82b..00000000000 --- a/src/cart/utils/rpms/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/src/cart/utils/rpms/packaging/Dockerfile.centos.7 b/src/cart/utils/rpms/packaging/Dockerfile.centos.7 deleted file mode 100644 index 70ba80402f1..00000000000 --- a/src/cart/utils/rpms/packaging/Dockerfile.centos.7 +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2018-2019, Intel Corporation -# -# 'recipe' for Docker to build an RPM -# - -# Pull base image -FROM centos:7 -MAINTAINER daos-stack - -# use same UID as host and default value of 1000 if not specified -ARG UID=1000 - -# Update distribution -#Nothing to do for CentOS - -# Install basic tools -RUN yum install -y epel-release -RUN yum install -y mock make rpm-build curl createrepo rpmlint redhat-lsb-core \ - git python-srpm-macros - -# Add build user (to keep rpmbuild happy) -ENV USER build -ENV PASSWD build -RUN useradd -u $UID -ms /bin/bash $USER -RUN echo "$USER:$PASSWD" | chpasswd -# add the user to the mock group so it can run mock -RUN usermod -a -G mock $USER - -# mock in Docker needs to use the old-chroot option -RUN grep use_nspawn || \ - echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg - -RUN chmod g+w /etc/mock/default.cfg diff --git a/src/cart/utils/rpms/packaging/Dockerfile.mockbuild b/src/cart/utils/rpms/packaging/Dockerfile.mockbuild deleted file mode 100644 index 02ef9ce84e4..00000000000 --- a/src/cart/utils/rpms/packaging/Dockerfile.mockbuild +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2018-2019, Intel Corporation -# -# 'recipe' for Docker to build an RPM -# - -# Pull base image -FROM fedora:latest -MAINTAINER daos-stack - -# use same UID as host and default value of 1000 if not specified -ARG UID=1000 - -# Install basic tools -RUN dnf -y install mock\ \<\ 2 mock-core-configs\ \<\ 32 make \ - rpm-build curl createrepo rpmlint redhat-lsb-core git \ - python-srpm-macros rpmdevtools - -# Add build user (to keep rpmbuild happy) -ENV USER build -ENV PASSWD build -RUN useradd -u $UID -ms /bin/bash $USER -RUN echo "$USER:$PASSWD" | chpasswd -# add the user to the mock group so it can run mock -RUN usermod -a -G mock $USER - -# mock in Docker needs to use the old-chroot option -RUN grep use_nspawn || \ - echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg - -RUN chmod g+w /etc/mock/* diff --git a/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.18.04 b/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.18.04 deleted file mode 100644 index 2180c9a0194..00000000000 --- a/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.18.04 +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2019, Intel Corporation -# -# 'recipe' for Docker to build an Debian package -# -# Pull base image -FROM ubuntu:18.04 -Maintainer daos-stack - -# use same UID as host and default value of 1000 if not specified -ARG UID=1000 - -# Install basic tools -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - autoconf bash curl debhelper dh-make dpkg-dev doxygen gcc \ - git git-buildpackage locales make patch pbuilder rpm wget - -# Add build user (to keep chrootbuild happy) -ENV USER build -RUN useradd -u $UID -ms /bin/bash $USER - -# need to run the build command as root, as it needs to chroot -RUN if ! grep "^#includedir /etc/sudoers.d" /etc/sudoers; then \ - echo "#includedir /etc/sudoers.d" >> /etc/sudoers; \ - fi; \ - echo "build ALL=(ALL) NOPASSWD: /usr/sbin/pbuilder" > /etc/sudoers.d/build; \ - chmod 0440 /etc/sudoers.d/build; \ - visudo -c; \ - sudo -l -U build diff --git a/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.rolling b/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.rolling deleted file mode 100644 index 02aca458445..00000000000 --- a/src/cart/utils/rpms/packaging/Dockerfile.ubuntu.rolling +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2019, Intel Corporation -# -# 'recipe' for Docker to build an Debian package -# -# Pull base image -FROM ubuntu:rolling -Maintainer daos-stack - -# use same UID as host and default value of 1000 if not specified -ARG UID=1000 - -# Install basic tools -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - autoconf bash curl debhelper dh-make dpkg-dev doxygen gcc \ - git git-buildpackage locales make patch pbuilder rpm wget - -# Add build user (to keep chrootbuild happy) -ENV USER build -RUN useradd -u $UID -ms /bin/bash $USER - -# need to run the build command as root, as it needs to chroot -RUN if ! grep "^#includedir /etc/sudoers.d" /etc/sudoers; then \ - echo "#includedir /etc/sudoers.d" >> /etc/sudoers; \ - fi; \ - echo "build ALL=(ALL) NOPASSWD: /usr/sbin/pbuilder" > /etc/sudoers.d/build; \ - chmod 0440 /etc/sudoers.d/build; \ - visudo -c; \ - sudo -l -U build diff --git a/src/cart/utils/rpms/packaging/Makefile_packaging.mk b/src/cart/utils/rpms/packaging/Makefile_packaging.mk deleted file mode 100644 index 12470680313..00000000000 --- a/src/cart/utils/rpms/packaging/Makefile_packaging.mk +++ /dev/null @@ -1,490 +0,0 @@ -# Common Makefile for including -# Needs the following variables set at a minimum: -# NAME := -# SRC_EXT := -# SOURCE = - -# Put site overrides (i.e. REPOSITORY_URL, DAOS_STACK_*_LOCAL_REPO) in here --include Makefile.local - -ifeq ($(DEB_NAME),) -DEB_NAME := $(NAME) -endif - -CALLING_MAKEFILE := $(word 1, $(MAKEFILE_LIST)) - -DOT := . -RPM_BUILD_OPTIONS += $(EXTERNAL_RPM_BUILD_OPTIONS) -# Find out what we are -ID_LIKE := $(shell . /etc/os-release; echo $$ID_LIKE) -# Of course that does not work for SLES-12 -ID := $(shell . /etc/os-release; echo $$ID) -VERSION_ID := $(shell . /etc/os-release; echo $$VERSION_ID) -ifeq ($(ID_LIKE),debian) -UBUNTU_VERS := $(shell . /etc/os-release; echo $$VERSION) -ifeq ($(VERSION_ID),19.04) -# Bug - distribution is set to "devel" -DISTRO_ID_OPT = --distribution disco -endif -DISTRO_ID := ubuntu$(VERSION_ID) -DISTRO_BASE = $(basename UBUNTU_$(VERSION_ID)) -VERSION_ID_STR := $(subst $(DOT),_,$(VERSION_ID)) -endif -ifeq ($(ID),fedora) -# a Fedora-based mock builder -# derive the the values of: -# VERSION_ID (i.e. 7) -# DISTRO_ID (i.e. el7) -# DISTRO_BASE (i.e. EL_7) -# from the CHROOT_NAME -ifeq ($(CHROOT_NAME),epel-7-x86_64) -VERSION_ID := 7 -DISTRO_ID := el7 -DISTRO_BASE := EL_7 -endif -ifeq ($(CHROOT_NAME),opensuse-leap-15.1-x86_64) -VERSION_ID := 15.1 -DISTRO_ID := sl15.1 -DISTRO_BASE := LEAP_15 -endif -ifeq ($(CHROOT_NAME),leap-42.3-x86_64) -# TBD if support is ever resurrected -endif -ifeq ($(CHROOT_NAME),sles-12.3-x86_64) -# TBD if support is ever resurrected -endif -endif -ifeq ($(ID),centos) -DISTRO_ID := el$(VERSION_ID) -DISTRO_BASE := $(basename EL_$(VERSION_ID)) -define install_repo - if yum-config-manager --add-repo=$(1); then \ - repo_file=$$(ls -tar /etc/yum.repos.d/*.repo | tail -1); \ - sed -i -e 1d -e '$$s/^/gpgcheck=False/' $$repo_file; \ - else \ - exit 1; \ - fi -endef -endif -ifeq ($(findstring opensuse,$(ID)),opensuse) -ID_LIKE := suse -DISTRO_ID := sl$(VERSION_ID) -DISTRO_BASE := $(basename LEAP_$(VERSION_ID)) -endif -ifeq ($(ID),sles) -# SLES-12 or 15 detected. -ID_LIKE := suse -DISTRO_ID := sle$(VERSION_ID) -DISTRO_BASE := $(basename SLES_$(VERSION_ID)) -endif -ifeq ($(ID_LIKE),suse) -define install_repo - zypper --non-interactive ar $(1) -endef -endif - -BUILD_OS ?= leap.15 -CHROOT_NAME ?= opensuse-leap-15.1-x86_64 -PACKAGING_CHECK_DIR ?= ../packaging -COMMON_RPM_ARGS := --define "%_topdir $$PWD/_topdir" $(BUILD_DEFINES) -DIST := $(shell rpm $(COMMON_RPM_ARGS) --eval %{?dist}) -ifeq ($(DIST),) -SED_EXPR := 1p -else -SED_EXPR := 1s/$(DIST)//p -endif -SPEC := $(NAME).spec -VERSION := $(shell rpm $(COMMON_RPM_ARGS) --specfile --qf '%{version}\n' $(SPEC) | sed -n '1p') -DEB_VERS := $(subst rc,~rc,$(VERSION)) -DEB_RVERS := $(subst $(DOT),\$(DOT),$(DEB_VERS)) -DEB_BVERS := $(basename $(subst ~rc,$(DOT)rc,$(DEB_VERS))) -RELEASE := $(shell rpm $(COMMON_RPM_ARGS) --specfile --qf '%{release}\n' $(SPEC) | sed -n '$(SED_EXPR)') -SRPM := _topdir/SRPMS/$(NAME)-$(VERSION)-$(RELEASE)$(DIST).src.rpm -RPMS := $(addsuffix .rpm,$(addprefix _topdir/RPMS/x86_64/,$(shell rpm --specfile $(SPEC)))) -DEB_TOP := _topdir/BUILD -DEB_BUILD := $(DEB_TOP)/$(NAME)-$(DEB_VERS) -DEB_TARBASE := $(DEB_TOP)/$(DEB_NAME)_$(DEB_VERS) -SOURCES := $(addprefix _topdir/SOURCES/,$(notdir $(SOURCE)) $(PATCHES)) -ifeq ($(ID_LIKE),debian) -DEBS := $(addsuffix _$(DEB_VERS)-1_amd64.deb,$(shell sed -n '/-udeb/b; s,^Package:[[:blank:]],$(DEB_TOP)/,p' debian/control)) -DEB_PREV_RELEASE := $(shell dpkg-parsechangelog -S version) -DEB_DSC := $(DEB_NAME)_$(DEB_PREV_RELEASE)$(GIT_INFO).dsc -#Ubuntu Containers do not set a UTF-8 environment by default. -ifndef LANG -export LANG = C.UTF-8 -endif -ifndef LC_ALL -export LC_ALL = C.UTF-8 -endif -TARGETS := $(DEBS) -else -# CentOS/Suse packages that want a locale set need this. -ifndef LANG -export LANG = en_US.utf8 -endif -ifndef LC_ALL -export LC_ALL = en_US.utf8 -endif -TARGETS := $(RPMS) $(SRPM) -endif - -define install_repos - for repo in $($(DISTRO_BASE)_PR_REPOS) \ - $(PR_REPOS) $(1); do \ - branch="master"; \ - build_number="lastSuccessfulBuild"; \ - if [[ $$repo = *@* ]]; then \ - branch="$${repo#*@}"; \ - repo="$${repo%@*}"; \ - if [[ $$branch = *:* ]]; then \ - build_number="$${branch#*:}"; \ - branch="$${branch%:*}"; \ - fi; \ - fi; \ - case $(DISTRO_ID) in \ - el7) distro="centos7"; \ - ;; \ - sle12.3) distro="sles12.3"; \ - ;; \ - sl42.3) distro="leap42.3"; \ - ;; \ - sl15.1) distro="leap15"; \ - ;; \ - esac; \ - baseurl=$${JENKINS_URL:-https://build.hpdd.intel.com/}job/daos-stack/job/$$repo/job/$$branch/; \ - baseurl+=$$build_number/artifact/artifacts/$$distro/; \ - $(call install_repo,$$baseurl); \ - done -endef - -all: $(TARGETS) - -%/: - mkdir -p $@ - -%.gz: % - rm -f $@ - gzip $< - -%.bz2: % - rm -f $@ - bzip2 $< - -%.xz: % - rm -f $@ - xz -z $< - -_topdir/SOURCES/%: % | _topdir/SOURCES/ - rm -f $@ - ln $< $@ - -# At least one spec file, SLURM (sles), has a different version for the -# download file than the version in the spec file. -ifeq ($(DL_VERSION),) -DL_VERSION = $(VERSION) -endif - -$(NAME)-$(DL_VERSION).tar.$(SRC_EXT).asc: $(SPEC) $(CALLING_MAKEFILE) - rm -f ./$(NAME)-*.tar.{gz,bz*,xz}.asc - curl -f -L -O '$(SOURCE).asc' - -$(NAME)-$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE) - rm -f ./$(NAME)-*.tar.{gz,bz*,xz} - curl -f -L -O '$(SOURCE)' - -v$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE) - rm -f ./v*.tar.{gz,bz*,xz} - curl -f -L -O '$(SOURCE)' - -$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE) - rm -f ./*.tar.{gz,bz*,xz} - curl -f -L -O '$(SOURCE)' - -$(DEB_TOP)/%: % | $(DEB_TOP)/ - -$(DEB_BUILD)/%: % | $(DEB_BUILD)/ - -$(DEB_BUILD).tar.$(SRC_EXT): $(notdir $(SOURCE)) | $(DEB_TOP)/ - ln -f $< $@ - -$(DEB_TARBASE).orig.tar.$(SRC_EXT) : $(DEB_BUILD).tar.$(SRC_EXT) - rm -f $(DEB_TOP)/*.orig.tar.* - ln -f $< $@ - -deb_detar: $(notdir $(SOURCE)) $(DEB_TARBASE).orig.tar.$(SRC_EXT) - # Unpack tarball - rm -rf ./$(DEB_TOP)/.patched ./$(DEB_TOP)/.detar - rm -rf ./$(DEB_BUILD)/* ./$(DEB_BUILD)/.pc ./$(DEB_BUILD)/.libs - mkdir -p $(DEB_BUILD) - tar -C $(DEB_BUILD) --strip-components=1 -xpf $< - -# Extract patches for Debian -$(DEB_TOP)/.patched: $(PATCHES) check-env deb_detar | \ - $(DEB_BUILD)/debian/ - mkdir -p ${DEB_BUILD}/debian/patches - mkdir -p $(DEB_TOP)/patches - for f in $(PATCHES); do \ - rm -f $(DEB_TOP)/patches/*; \ - if git mailsplit -o$(DEB_TOP)/patches < "$$f" ;then \ - fn=$$(basename "$$f"); \ - for f1 in $(DEB_TOP)/patches/*;do \ - [ -e "$$f1" ] || continue; \ - f1n=$$(basename "$$f1"); \ - echo "$${fn}_$${f1n}" >> $(DEB_BUILD)/debian/patches/series ; \ - mv "$$f1" $(DEB_BUILD)/debian/patches/$${fn}_$${f1n}; \ - done; \ - else \ - fb=$$(basename "$$f"); \ - cp "$$f" $(DEB_BUILD)/debian/patches/ ; \ - echo "$$fb" >> $(DEB_BUILD)/debian/patches/series ; \ - if ! grep -q "^Description:\|^Subject:" "$$f" ;then \ - sed -i '1 iSubject: Auto added patch' \ - "$(DEB_BUILD)/debian/patches/$$fb" ;fi ; \ - if ! grep -q "^Origin:\|^Author:\|^From:" "$$f" ;then \ - sed -i '1 iOrigin: other' \ - "$(DEB_BUILD)/debian/patches/$$fb" ;fi ; \ - fi ; \ - done - touch $@ - - -# Move the debian files into the Debian directory. -ifeq ($(ID_LIKE),debian) -$(DEB_TOP)/.deb_files : $(shell find debian -type f) deb_detar | \ - $(DEB_BUILD)/debian/ - find debian -maxdepth 1 -type f -exec cp '{}' '$(DEB_BUILD)/{}' ';' - if [ -e debian/source ]; then \ - cp -r debian/source $(DEB_BUILD)/debian; fi - if [ -e debian/local ]; then \ - cp -r debian/local $(DEB_BUILD)/debian; fi - if [ -e debian/examples ]; then \ - cp -r debian/examples $(DEB_BUILD)/debian; fi - if [ -e debian/upstream ]; then \ - cp -r debian/upstream $(DEB_BUILD)/debian; fi - if [ -e debian/tests ]; then \ - cp -r debian/tests $(DEB_BUILD)/debian; fi - rm -f $(DEB_BUILD)/debian/*.ex $(DEB_BUILD)/debian/*.EX - rm -f $(DEB_BUILD)/debian/*.orig -ifneq ($(GIT_INFO),) - cd $(DEB_BUILD); dch --distribution unstable \ - --newversion $(DEB_PREV_RELEASE)$(GIT_INFO) \ - "Git commit information" -endif - touch $@ -endif - -# see https://stackoverflow.com/questions/2973445/ for why we subst -# the "rpm" for "%" to effectively turn this into a multiple matching -# target pattern rule -$(subst rpm,%,$(RPMS)): $(SPEC) $(SOURCES) - rpmbuild -bb $(COMMON_RPM_ARGS) $(RPM_BUILD_OPTIONS) $(SPEC) - -$(subst deb,%,$(DEBS)): $(DEB_BUILD).tar.$(SRC_EXT) \ - deb_detar $(DEB_TOP)/.deb_files $(DEB_TOP)/.patched - rm -f $(DEB_TOP)/*.deb $(DEB_TOP)/*.ddeb $(DEB_TOP)/*.dsc \ - $(DEB_TOP)/*.dsc $(DEB_TOP)/*.build* $(DEB_TOP)/*.changes \ - $(DEB_TOP)/*.debian.tar.* - rm -rf $(DEB_TOP)/*-tmp - cd $(DEB_BUILD); debuild --no-lintian -b -us -uc - cd $(DEB_BUILD); debuild -- clean - git status - rm -rf $(DEB_TOP)/$(NAME)-tmp - lfile1=$(shell echo $(DEB_TOP)/$(NAME)[0-9]*_$(DEB_VERS)-1_amd64.deb);\ - lfile=$$(ls $${lfile1}); \ - lfile2=$${lfile##*/}; lname=$${lfile2%%_*}; \ - dpkg-deb -R $${lfile} \ - $(DEB_TOP)/$(NAME)-tmp; \ - if [ -e $(DEB_TOP)/$(NAME)-tmp/DEBIAN/symbols ]; then \ - sed 's/$(DEB_RVERS)-1/$(DEB_BVERS)/' \ - $(DEB_TOP)/$(NAME)-tmp/DEBIAN/symbols \ - > $(DEB_BUILD)/debian/$${lname}.symbols; fi - cd $(DEB_BUILD); debuild -us -uc - rm $(DEB_BUILD).tar.$(SRC_EXT) - for f in $(DEB_TOP)/*.deb; do \ - echo $$f; dpkg -c $$f; done - -$(DEB_TOP)/$(DEB_DSC): $(CALLING_MAKEFILE) $(DEB_BUILD).tar.$(SRC_EXT) \ - deb_detar $(DEB_TOP)/.deb_files $(DEB_TOP)/.patched - rm -f $(DEB_TOP)/*.deb $(DEB_TOP)/*.ddeb $(DEB_TOP)/*.dsc \ - $(DEB_TOP)/*.dsc $(DEB_TOP)/*.build* $(DEB_TOP)/*.changes \ - $(DEB_TOP)/*.debian.tar.* - rm -rf $(DEB_TOP)/*-tmp - cd $(DEB_BUILD); dpkg-buildpackage -S --no-sign --no-check-builddeps - -$(SRPM): $(SPEC) $(SOURCES) - rpmbuild -bs $(COMMON_RPM_ARGS) $(RPM_BUILD_OPTIONS) $(SPEC) - -srpm: $(SRPM) - -$(RPMS): $(SRPM) $(CALLING_MAKEFILE) - -rpms: $(RPMS) - -$(DEBS): $(CALLING_MAKEFILE) - -debs: $(DEBS) - -ls: $(TARGETS) - ls -ld $^ - -# *_LOCAL_* repos are locally built packages. -# *_GROUP_* repos are a local mirror of a group of upstream repos. -# *_GROUP_* repos may not supply a repomd.xml.key. -ifneq ($(REPOSITORY_URL),) -ifneq ($(DAOS_STACK_$(DISTRO_BASE)_LOCAL_REPO),) -$(DISTRO_BASE)_LOCAL_REPOS := $(REPOSITORY_URL)$(DAOS_STACK_$(DISTRO_BASE)_LOCAL_REPO)/ -endif -ifneq ($(DAOS_STACK_$(DISTRO_BASE)_GROUP_REPO),) -$(DISTRO_BASE)_LOCAL_REPOS += $(REPOSITORY_URL)$(DAOS_STACK_$(DISTRO_BASE)_GROUP_REPO)/ -endif -endif - -ifeq ($(ID_LIKE),debian) -ifneq ($(DAOS_STACK_REPO_SUPPORT),) -TEST_STR := $(DAOS_STACK_REPO_UBUNTU_$(VERSION_ID_STR)_LIST) -ifneq ($(TEST_STR),) -UBUNTU_REPOS := $(shell curl $(DAOS_STACK_REPO_SUPPORT)$(TEST_STR)) -# Additional repos can be added but must be separated by a | character. -UBUNTU_ADD_REPOS = --othermirror "$(UBUNTU_REPOS)" -else -ifneq ($(DAOS_STACK_REPO_UBUNTU_ROLLING_LIST),) -UBUNTU_REPOS := $(shell curl $(DAOS_STACK_REPO_SUPPORT)$(DAOS_STACK_REPO_UBUNTU_ROLLING_LIST)) -# Additional repos can be added but must be separated by a | character. -UBUNTU_ADD_REPOS = --othermirror "$(UBUNTU_REPOS)" -endif -endif -# Need to figure out how to support multiple keys, such as for IPMCTL -ifneq ($(DAOS_STACK_REPO_PUB_KEY),) -HAVE_DAOS_STACK_KEY := TRUE - -$(DAOS_STACK_REPO_PUB_KEY): - curl -f -L -O '$(DAOS_STACK_REPO_SUPPORT)$(DAOS_STACK_REPO_PUB_KEY)' -endif -endif - -chrootbuild: $(DEB_TOP)/$(DEB_DSC) $(DAOS_STACK_REPO_PUB_KEY) - sudo pbuilder create \ - --extrapackages "gnupg ca-certificates" $(DISTRO_ID_OPT) -ifneq ($(HAVE_DAOS_STACK_KEY),) - printf "apt-key add - <> /etc/mock/$(CHROOT_NAME).cfg; \ - case $(DISTRO_ID) in \ - el7) distro="centos7"; \ - ;; \ - sle12.3) distro="sles12.3"; \ - ;; \ - sl42.3) distro="leap42.3"; \ - ;; \ - sl15.1) distro="leap15"; \ - ;; \ - esac; \ - for repo in $($(DISTRO_BASE)_PR_REPOS) $(PR_REPOS); do \ - branch="master"; \ - build_number="lastSuccessfulBuild"; \ - if [[ $$repo = *@* ]]; then \ - branch="$${repo#*@}"; \ - repo="$${repo%@*}"; \ - if [[ $$branch = *:* ]]; then \ - build_number="$${branch#*:}"; \ - branch="$${branch%:*}"; \ - fi; \ - fi; \ - echo -e "[$$repo:$$branch:$$build_number]\n\ -name=$$repo:$$branch:$$build_number\n\ -baseurl=$${JENKINS_URL:-https://build.hpdd.intel.com/}job/daos-stack/job/$$repo/job/$$branch/$$build_number/artifact/artifacts/$$distro/\n\ -enabled=1\n\ -gpgcheck=False\n" >> /etc/mock/$(CHROOT_NAME).cfg; \ - done; \ - for repo in $($(DISTRO_BASE)_LOCAL_REPOS) $($(DISTRO_BASE)_REPOS); do \ - repo_name=$${repo##*://}; \ - repo_name=$${repo_name//\//_}; \ - echo -e "[$$repo_name]\n\ -name=$${repo_name}\n\ -baseurl=$${repo}\n\ -enabled=1\n" >> /etc/mock/$(CHROOT_NAME).cfg; \ - done; \ - echo "\"\"\"" >> /etc/mock/$(CHROOT_NAME).cfg; \ - else \ - echo "Unable to update /etc/mock/$(CHROOT_NAME).cfg."; \ - echo "You need to make sure it has the needed repos in it yourself."; \ - fi - mock -r $(CHROOT_NAME) $(MOCK_OPTIONS) $(RPM_BUILD_OPTIONS) $< -endif - -docker_chrootbuild: - docker build --build-arg UID=$$(id -u) -t $(BUILD_OS)-chrootbuild \ - -f packaging/Dockerfile.$(BUILD_OS) . - docker run --privileged=true -w $$PWD/../.. -v=$$PWD/../..:$$PWD/../.. \ - -it $(BUILD_OS)-chrootbuild bash -c "make -C utils/rpms chrootbuild" - -rpmlint: $(SPEC) - rpmlint $< - -packaging_check: - if grep -e --repo $(CALLING_MAKEFILE); then \ - echo "SUSE repos in $(CALLING_MAKEFILE) don't need a \"--repo\" any more"; \ - exit 2; \ - fi - if ! diff --exclude \*.sw? \ - --exclude debian \ - --exclude .git \ - --exclude Jenkinsfile \ - --exclude libfabric.spec \ - --exclude Makefile \ - --exclude README.md \ - --exclude _topdir \ - --exclude \*.tar.\* \ - --exclude \*.code-workspace \ - --exclude install \ - -bur $(PACKAGING_CHECK_DIR)/ packaging/; then \ - exit 1; \ - fi - -check-env: -ifndef DEBEMAIL - $(error DEBEMAIL is undefined) -endif -ifndef DEBFULLNAME - $(error DEBFULLNAME is undefined) -endif - -test: - @echo "No test defined for this module" - -show_version: - @echo $(VERSION) - -show_release: - @echo $(RELEASE) - -show_rpms: - @echo $(RPMS) - -show_source: - @echo $(SOURCE) - -show_sources: - @echo $(SOURCES) - -show_targets: - @echo $(TARGETS) - -show_makefiles: - @echo $(MAKEFILE_LIST) - -show_calling_makefile: - @echo $(CALLING_MAKEFILE) - -show_git_metadata: - @echo $(GIT_SHA1):$(GIT_SHORT):$(GIT_NUM_COMMITS) - -.PHONY: srpm rpms debs deb_detar ls chrootbuild rpmlint FORCE \ - show_version show_release show_rpms show_source show_sources \ - show_targets check-env show_git_metadata \ No newline at end of file diff --git a/src/cart/utils/run_test.sh b/src/cart/utils/run_test.sh index 154ad32ea9d..063168545ea 100755 --- a/src/cart/utils/run_test.sh +++ b/src/cart/utils/run_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2016-2019 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/cart/utils/setup_local.sh b/src/cart/utils/setup_local.sh index 450641ac010..361aef5f223 100644 --- a/src/cart/utils/setup_local.sh +++ b/src/cart/utils/setup_local.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/cart/utils/test_cart_lib.sh b/src/cart/utils/test_cart_lib.sh index 39b792fc5fe..934548227cc 100755 --- a/src/cart/utils/test_cart_lib.sh +++ b/src/cart/utils/test_cart_lib.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2016-2018 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/common/lru.c b/src/common/lru.c index 175bcfd405d..e83458ded6f 100644 --- a/src/common/lru.c +++ b/src/common/lru.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Intel Corporation +/* Copyright 2016-2022 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/include/daos/lru.h b/src/include/daos/lru.h index ec1fcae5003..f7184fc7e7b 100644 --- a/src/include/daos/lru.h +++ b/src/include/daos/lru.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Intel Corporation +/* Copyright 2016-2022 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/rdb/raft_tests/raft_tests.py b/src/rdb/raft_tests/raft_tests.py index 0b219b6f823..3a34b223f94 100755 --- a/src/rdb/raft_tests/raft_tests.py +++ b/src/rdb/raft_tests/raft_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2018-2021 Intel Corporation +# Copyright 2018-2022 Intel Corporation # # SPDX-License-Identifier: BSD-2-Clause-Patent # diff --git a/src/tests/ftest/cart/SConscript b/src/tests/ftest/cart/SConscript index 27e5a1f04f9..f7aec23abb1 100644 --- a/src/tests/ftest/cart/SConscript +++ b/src/tests/ftest/cart/SConscript @@ -1,5 +1,5 @@ #!python -# Copyright (C) 2016-2021 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/cart/util/cart_logparse.py b/src/tests/ftest/cart/util/cart_logparse.py index 395589aa7fc..dfeaa07db9c 100644 --- a/src/tests/ftest/cart/util/cart_logparse.py +++ b/src/tests/ftest/cart/util/cart_logparse.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (C) 2018-2019 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/cart/util/cart_logtest.py b/src/tests/ftest/cart/util/cart_logtest.py index 4fdcf9a0d23..e2528a5d821 100755 --- a/src/tests/ftest/cart/util/cart_logtest.py +++ b/src/tests/ftest/cart/util/cart_logtest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright 2018-2022 Intel Corporation # # SPDX-License-Identifier: BSD-2-Clause-Patent diff --git a/src/tests/ftest/scripts/cleanup_nodes.sh b/src/tests/ftest/scripts/cleanup_nodes.sh index adb7a38b440..aaf67fa74e3 100755 --- a/src/tests/ftest/scripts/cleanup_nodes.sh +++ b/src/tests/ftest/scripts/cleanup_nodes.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/scripts/main.sh b/src/tests/ftest/scripts/main.sh index 817587065b2..6819965e6e6 100644 --- a/src/tests/ftest/scripts/main.sh +++ b/src/tests/ftest/scripts/main.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2020-2021 Intel Corporation +# Copyright 2020-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/scripts/post_process_xml.sh b/src/tests/ftest/scripts/post_process_xml.sh index 01b0e657feb..c0217f37eb9 100755 --- a/src/tests/ftest/scripts/post_process_xml.sh +++ b/src/tests/ftest/scripts/post_process_xml.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2021 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/scripts/pre_clean_nodes.sh b/src/tests/ftest/scripts/pre_clean_nodes.sh index 2aca304c2f5..b9af07e8c42 100755 --- a/src/tests/ftest/scripts/pre_clean_nodes.sh +++ b/src/tests/ftest/scripts/pre_clean_nodes.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/tests/ftest/scripts/setup_nodes.sh b/src/tests/ftest/scripts/setup_nodes.sh index 4a1e033e5f7..47d288c0f56 100644 --- a/src/tests/ftest/scripts/setup_nodes.sh +++ b/src/tests/ftest/scripts/setup_nodes.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/utils/certs/gen_certificates.sh b/utils/certs/gen_certificates.sh index ce0cb7aa215..f220a0b2f40 100755 --- a/utils/certs/gen_certificates.sh +++ b/utils/certs/gen_certificates.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2019 Intel Corporation. +# Copyright 2019-2022 Intel Corporation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/utils/check_modules.sh b/utils/check_modules.sh index 265b924a60e..c966a9eac19 100755 --- a/utils/check_modules.sh +++ b/utils/check_modules.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2018-2019 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/utils/completion/daos.bash b/utils/completion/daos.bash index 079f81037cb..77910ef3c04 100644 --- a/utils/completion/daos.bash +++ b/utils/completion/daos.bash @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) Copyright 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/utils/docker/Dockerfile.centos.7 b/utils/docker/Dockerfile.centos.7 index def74937d97..5ba1726ae6a 100644 --- a/utils/docker/Dockerfile.centos.7 +++ b/utils/docker/Dockerfile.centos.7 @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2022 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # 'recipe' for Docker to build an image of centOS 7 based diff --git a/utils/docker/Dockerfile.centos.8 b/utils/docker/Dockerfile.centos.8 index 5ef9aa9f061..329dd2011b7 100644 --- a/utils/docker/Dockerfile.centos.8 +++ b/utils/docker/Dockerfile.centos.8 @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2022 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # 'recipe' for Docker to build an image of centOS 8 based diff --git a/utils/docker/Dockerfile.checkpatch b/utils/docker/Dockerfile.checkpatch index 750c58d3fd0..83ce983cc07 100644 --- a/utils/docker/Dockerfile.checkpatch +++ b/utils/docker/Dockerfile.checkpatch @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # 'recipe' for Docker to build a image for running static analysis checking. diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index e40fd53e4fc..b73ceb81235 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2022 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # 'recipe' for Docker to build an image of Leap based diff --git a/utils/docker/Dockerfile.ubuntu.20.04 b/utils/docker/Dockerfile.ubuntu.20.04 index 88c3409a0c7..c91693f1681 100644 --- a/utils/docker/Dockerfile.ubuntu.20.04 +++ b/utils/docker/Dockerfile.ubuntu.20.04 @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2022 Intel Corporation +# Copyright 2018-2022 Intel Corporation # All rights reserved. # # 'recipe' for Docker to build an image of Ubuntu-based diff --git a/utils/docker/vcluster/.env b/utils/docker/vcluster/.env index 38b7588ce52..e24729e3b46 100644 --- a/utils/docker/vcluster/.env +++ b/utils/docker/vcluster/.env @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # Configuration file for DAOS docker compose diff --git a/utils/docker/vcluster/daos-admin/el8/Dockerfile b/utils/docker/vcluster/daos-admin/el8/Dockerfile index 7e2dd977e5e..b9c3885ff3e 100644 --- a/utils/docker/vcluster/daos-admin/el8/Dockerfile +++ b/utils/docker/vcluster/daos-admin/el8/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # 'recipe' for building a RHEL variant docker image of a DAOS administrator node diff --git a/utils/docker/vcluster/daos-base/el8/Dockerfile b/utils/docker/vcluster/daos-base/el8/Dockerfile index 56fd75ec455..5982fc209ca 100644 --- a/utils/docker/vcluster/daos-base/el8/Dockerfile +++ b/utils/docker/vcluster/daos-base/el8/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # 'recipe' for building a base RHEL variant docker image of a DAOS node diff --git a/utils/docker/vcluster/daos-client/el8/Dockerfile b/utils/docker/vcluster/daos-client/el8/Dockerfile index b1e4b51648d..79b6c24ca08 100644 --- a/utils/docker/vcluster/daos-client/el8/Dockerfile +++ b/utils/docker/vcluster/daos-client/el8/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # 'recipe' for building a RHEL variant docker image of a DAOS client node diff --git a/utils/docker/vcluster/daos-server/el8/Dockerfile b/utils/docker/vcluster/daos-server/el8/Dockerfile index 5f82579ff68..588f9413f0e 100644 --- a/utils/docker/vcluster/daos-server/el8/Dockerfile +++ b/utils/docker/vcluster/daos-server/el8/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # 'recipe' for building a RHEL variant docker image of a DAOS server node diff --git a/utils/docker/vcluster/docker-compose.yml b/utils/docker/vcluster/docker-compose.yml index 3212cc7f45a..7c1900b921e 100644 --- a/utils/docker/vcluster/docker-compose.yml +++ b/utils/docker/vcluster/docker-compose.yml @@ -1,5 +1,5 @@ --- -# Copyright (C) 2021-2022 Intel Corporation +# Copyright 2021-2022 Intel Corporation # All rights reserved. # # Docker Compose file allowing to build and deploy locally a DAOS virtual cluster diff --git a/utils/githooks/pre-commit b/utils/githooks/pre-commit index f953698a12c..aec005fc7f2 100755 --- a/utils/githooks/pre-commit +++ b/utils/githooks/pre-commit @@ -1,21 +1,48 @@ #!/bin/bash -# A git hook to validate and correct the copyright date in source files. +# A git hook to validate and correct the copyright date in source files. if [ -n "${NO_PRE_COMMIT:=""}" ]; then - exit 0 + exit 0 fi regex='(^[[:blank:]]*[\*/]*.*)((Copyright[[:blank:]]*)([0-9]{4})(-([0-9]{4}))?)([[:blank:]]*(Intel.*$))' year=$(date +%Y) errors=0 +targets=( + # code source files + '*.c' + '*.h' + '*.go' + '*.py' + '*.proto' + '*.java' + '*.yml' + '*.yaml' + '*.sh' + '*.bash' + # DevOps files + 'Makefile' + 'Jenkinsfile' + 'SConscript' + 'SConstruct' + 'Dockerfile*' + # Documentation files + '*.txt' + '*.md' + 'README*' + 'NOTICE*' + 'LICENSE*' + 'copyright' + # Miscellaneous files + '.env' +) -files=$(git diff --diff-filter=AM --name-only --cached -- \ - '*.c' '*.h' '*.go' 'Makefile' '*.py' '*.proto' '*.java') +files=$(git diff --diff-filter=AM --name-only --cached -- "${targets[@]}") for file in $files; do - if [[ "$file" == *vendor* ]] || [[ "$file" == *pb.go ]] || \ - [[ "$file" == *_string.go ]] || [[ "$file" == *pb-c* ]]; then - continue - fi + if [[ "$file" == *vendor* ]] || [[ "$file" == *pb.go ]] || \ + [[ "$file" == *_string.go ]] || [[ "$file" == *pb-c* ]]; then + continue + fi read -r y1 y2 <<< "$(sed -nre "s/^.*$regex.*$/\4 \6/p" "$file")" if [[ -z $y1 ]] ; then echo "Copyright Information not found in: $file" diff --git a/utils/sl/check_script.py b/utils/sl/check_script.py index 86aab08e6ce..ce0f4ad21a1 100755 --- a/utils/sl/check_script.py +++ b/utils/sl/check_script.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Copyright (c) 2016-2021 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Action/__init__.py b/utils/sl/fake_scons/SCons/Action/__init__.py index f153cfbccf3..a4aace7426d 100644 --- a/utils/sl/fake_scons/SCons/Action/__init__.py +++ b/utils/sl/fake_scons/SCons/Action/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Intel Corporation +# Copyright 2021-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Builder/__init__.py b/utils/sl/fake_scons/SCons/Builder/__init__.py index 7d607b0b36d..b1ee5b985c7 100644 --- a/utils/sl/fake_scons/SCons/Builder/__init__.py +++ b/utils/sl/fake_scons/SCons/Builder/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2022 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Errors/__init__.py b/utils/sl/fake_scons/SCons/Errors/__init__.py index 932e4529021..587e5182627 100644 --- a/utils/sl/fake_scons/SCons/Errors/__init__.py +++ b/utils/sl/fake_scons/SCons/Errors/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2022 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Script/__init__.py b/utils/sl/fake_scons/SCons/Script/__init__.py index 8e0226297df..1c891ba877a 100644 --- a/utils/sl/fake_scons/SCons/Script/__init__.py +++ b/utils/sl/fake_scons/SCons/Script/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2020 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Subst/__init__.py b/utils/sl/fake_scons/SCons/Subst/__init__.py index 834f4353155..a4de4953562 100644 --- a/utils/sl/fake_scons/SCons/Subst/__init__.py +++ b/utils/sl/fake_scons/SCons/Subst/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Variables/__init__.py b/utils/sl/fake_scons/SCons/Variables/__init__.py index 560fee02bbd..cd229c87f68 100644 --- a/utils/sl/fake_scons/SCons/Variables/__init__.py +++ b/utils/sl/fake_scons/SCons/Variables/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/Warnings/__init__.py b/utils/sl/fake_scons/SCons/Warnings/__init__.py index e896bfff873..2f2125f1a86 100644 --- a/utils/sl/fake_scons/SCons/Warnings/__init__.py +++ b/utils/sl/fake_scons/SCons/Warnings/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Intel Corporation +# Copyright 2020-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/fake_scons/SCons/__init__.py b/utils/sl/fake_scons/SCons/__init__.py index 443629bc881..a1b958e9f1c 100644 --- a/utils/sl/fake_scons/SCons/__init__.py +++ b/utils/sl/fake_scons/SCons/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2022 Intel Corporation +# Copyright 2016-2022 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/utils/sl/setup_local.sh b/utils/sl/setup_local.sh index 7432d84b003..9eaf4848bc4 100644 --- a/utils/sl/setup_local.sh +++ b/utils/sl/setup_local.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2016-2018 Intel Corporation +# Copyright 2016-2022 Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without