From c20e07d48c906ecb7d90cdfb4d3ad449f5363885 Mon Sep 17 00:00:00 2001 From: Rakshitha Kamath Date: Wed, 5 Jul 2023 11:10:43 +0530 Subject: [PATCH] Consolidate basic-gluster-duffy script Signed-off-by: Rakshitha Kamath --- .../build-fsal_cephfs}/bootstrap.py | 0 .../build-fsal_cephfs}/build-fsal_cephfs.sh | 0 .../nfs-ganesha_trigger-fsal_cephfs.xml | 0 .../build-fsal_gluster}/bootstrap.py | 0 .../build-fsal_gluster}/build-fsal_gluster.sh | 0 .../nfs-ganesha_trigger-fsal_gluster.xml | 0 .../build-fsal_rgw}/bootstrap.py | 0 .../build-fsal_rgw}/build-fsal_rgw.sh | 0 .../nfs-ganesha_trigger-fsal_rgw.xml | 0 .../build-pylint}/bootstrap.py | 0 .../build-pylint}/build-pylint.sh | 0 .../nfs-ganesha_trigger-pylint.xml | 0 .../build-tests}/bootstrap.py | 0 .../build-tests}/build-tests.sh | 0 .../nfs-ganesha_trigger-tests.xml | 0 .../checkpatch}/.checkpatch.conf | 0 .../checkpatch}/checkpatch-to-gerrit-json.py | 0 .../checkpatch}/checkpatch.pl | 0 .../checkpatch}/jenkins.sh | 0 .../checkpatch}/spelling.txt | 0 .../client-permissions}/client.sh | 0 .../client-permissions}/duffy.py | 0 .../client-permissions}/server.sh | 0 .../code-compilation}/client.sh | 0 .../common-scripts}/add-gerrit-comment.sh | 0 .../common-scripts}/basic-gluster-duffy.py | 0 .../common-scripts}/basic-gluster.sh | 0 .../common-scripts}/basic-vfs-duffy.py | 0 .../common-scripts}/basic-vfs-minmd.sh | 0 .../common-scripts}/basic-vfs.sh | 0 {cthon04 => NEEDS_REVIEW/cthon04}/client.sh | 0 .../cthon04}/nfs_ganesha_cthon04.xml | 0 {dbench => NEEDS_REVIEW/dbench}/client.sh | 0 {iozone => NEEDS_REVIEW/iozone}/client.sh | 0 .../labelled_nfs}/client.sh | 0 .../nfs_ganesha_labelled_nfs.xml | 0 ...s-ganesha_trigger-cthon04-on-new-patch.xml | 0 ...a_trigger-on-new-build_next-el7-x86_64.xml | 0 .../nightly-builds}/libntirpc/build.sh | 0 .../nightly-builds}/libntirpc/jenkins-job.py | 0 .../libntirpc}/libntirpc.repo.in | 0 .../libntirpc/libntirpc.spec.in | 0 .../libntirpc/nfs-ganesha_build-libntirpc.xml | 0 .../nfs-ganesha_trigger-libntirpc-builds.xml | 0 .../nightly-builds}/nfs-ganesha/build.sh | 0 .../nfs-ganesha/jenkins-job.py | 0 .../nfs-ganesha/nfs-ganesha.repo.in | 0 .../nfs-ganesha/nfs-ganesha.spec.in | 0 .../nfs-ganesha/nfs-ganesha_build-ganesha.xml | 0 .../nfs-ganesha_trigger-ganesha-builds.xml | 0 .../posix_compliance}/client.py | 0 {pynfs => NEEDS_REVIEW/pynfs}/client.py | 0 {pynfs => NEEDS_REVIEW/pynfs}/client.sh | 0 .../pynfs}/nfs_ganesha_pynfs.xml | 0 .../small-file}/client.sh | 0 .../small-file}/nfs_ganesha_small_file.xml | 0 .../build-tests/basic-gluster-duffy.sh | 31 --------- .../code-compilation/basic-gluster-duffy.sh | 48 -------------- build_scripts/common/basic-server-client.sh | 64 +++++++++++++++++++ .../common/get-node.sh | 0 build_scripts/common/return-node.sh | 13 ++-- build_scripts/cthon04/basic-gluster-duffy.sh | 50 --------------- build_scripts/dbench/basic-gluster-duffy.sh | 60 ----------------- .../ganesha-build/basic-gluster-duffy.sh | 31 --------- build_scripts/ganesha-build/build-ganesha.sh | 1 + build_scripts/iozone/basic-gluster-duffy.sh | 58 ----------------- .../libntirpc-build/basic-gluster-duffy.sh | 31 --------- .../libntirpc-template}/libntirpc.repo.in | 0 .../libntirpc.spec.in | 0 .../libntirpc_centos7.spec.in | 0 .../posix-compliance/basic-gluster-duffy.sh | 51 --------------- build_scripts/pylint/basic-gluster-duffy.sh | 31 --------- build_scripts/pylint/build-pylint.sh | 4 +- build_scripts/pynfs/basic-gluster-duffy.sh | 55 ---------------- build_scripts/pynfs/client.sh | 28 ++++---- .../small-file/basic-gluster-duffy.sh | 50 --------------- jobs/code_compilation.yml | 2 +- jobs/cthon04.yml | 4 +- jobs/dbench.yml | 2 +- jobs/fsal_template.yml | 2 +- jobs/ganesha-build.yml | 4 +- jobs/labelled_nfs.yml | 11 +--- jobs/libntirpc-build.yml | 6 +- jobs/macros.yml | 7 +- jobs/posix-compliance.yml | 2 +- jobs/pylint.yml | 2 +- jobs/pynfs-acl.yml | 2 +- jobs/pynfs.yml | 4 +- jobs/scripts/common.sh | 12 +--- jobs/scripts/common/return-node.sh | 8 --- jobs/scripts/posix_compliance.sh | 2 +- jobs/scripts/pylint.sh | 2 +- jobs/scripts/tests.sh | 2 +- jobs/small-file.yml | 4 +- jobs/template_iozone.yml | 2 +- jobs/trigger-cthon04-on-new-patch.yml | 3 + jobs/trigger-ganesha-builds.yml | 2 +- jobs/trigger-tests.yml | 2 +- 98 files changed, 123 insertions(+), 570 deletions(-) rename {build-fsal_cephfs => NEEDS_REVIEW/build-fsal_cephfs}/bootstrap.py (100%) rename {build-fsal_cephfs => NEEDS_REVIEW/build-fsal_cephfs}/build-fsal_cephfs.sh (100%) rename {build-fsal_cephfs => NEEDS_REVIEW/build-fsal_cephfs}/nfs-ganesha_trigger-fsal_cephfs.xml (100%) rename {build-fsal_gluster => NEEDS_REVIEW/build-fsal_gluster}/bootstrap.py (100%) rename {build-fsal_gluster => NEEDS_REVIEW/build-fsal_gluster}/build-fsal_gluster.sh (100%) rename {build-fsal_gluster => NEEDS_REVIEW/build-fsal_gluster}/nfs-ganesha_trigger-fsal_gluster.xml (100%) rename {build-fsal_rgw => NEEDS_REVIEW/build-fsal_rgw}/bootstrap.py (100%) rename {build-fsal_rgw => NEEDS_REVIEW/build-fsal_rgw}/build-fsal_rgw.sh (100%) rename {build-fsal_rgw => NEEDS_REVIEW/build-fsal_rgw}/nfs-ganesha_trigger-fsal_rgw.xml (100%) rename {build-pylint => NEEDS_REVIEW/build-pylint}/bootstrap.py (100%) rename {build-pylint => NEEDS_REVIEW/build-pylint}/build-pylint.sh (100%) rename {build-pylint => NEEDS_REVIEW/build-pylint}/nfs-ganesha_trigger-pylint.xml (100%) rename {build-tests => NEEDS_REVIEW/build-tests}/bootstrap.py (100%) rename {build-tests => NEEDS_REVIEW/build-tests}/build-tests.sh (100%) rename {build-tests => NEEDS_REVIEW/build-tests}/nfs-ganesha_trigger-tests.xml (100%) rename {checkpatch => NEEDS_REVIEW/checkpatch}/.checkpatch.conf (100%) rename {checkpatch => NEEDS_REVIEW/checkpatch}/checkpatch-to-gerrit-json.py (100%) rename {checkpatch => NEEDS_REVIEW/checkpatch}/checkpatch.pl (100%) rename {checkpatch => NEEDS_REVIEW/checkpatch}/jenkins.sh (100%) rename {checkpatch => NEEDS_REVIEW/checkpatch}/spelling.txt (100%) rename {client-permissions => NEEDS_REVIEW/client-permissions}/client.sh (100%) rename {client-permissions => NEEDS_REVIEW/client-permissions}/duffy.py (100%) rename {client-permissions => NEEDS_REVIEW/client-permissions}/server.sh (100%) rename {code-compilation => NEEDS_REVIEW/code-compilation}/client.sh (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/add-gerrit-comment.sh (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/basic-gluster-duffy.py (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/basic-gluster.sh (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/basic-vfs-duffy.py (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/basic-vfs-minmd.sh (100%) rename {common-scripts => NEEDS_REVIEW/common-scripts}/basic-vfs.sh (100%) rename {cthon04 => NEEDS_REVIEW/cthon04}/client.sh (100%) rename {cthon04 => NEEDS_REVIEW/cthon04}/nfs_ganesha_cthon04.xml (100%) rename {dbench => NEEDS_REVIEW/dbench}/client.sh (100%) rename {iozone => NEEDS_REVIEW/iozone}/client.sh (100%) rename {labelled_nfs => NEEDS_REVIEW/labelled_nfs}/client.sh (100%) rename {labelled_nfs => NEEDS_REVIEW/labelled_nfs}/nfs_ganesha_labelled_nfs.xml (100%) rename nfs-ganesha_trigger-cthon04-on-new-patch.xml => NEEDS_REVIEW/nfs-ganesha_trigger-cthon04-on-new-patch.xml (100%) rename nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml => NEEDS_REVIEW/nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/libntirpc/build.sh (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/libntirpc/jenkins-job.py (100%) rename {build_scripts/libntirpc-build/template_files => NEEDS_REVIEW/nightly-builds/libntirpc}/libntirpc.repo.in (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/libntirpc/libntirpc.spec.in (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/libntirpc/nfs-ganesha_build-libntirpc.xml (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/libntirpc/nfs-ganesha_trigger-libntirpc-builds.xml (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/build.sh (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/jenkins-job.py (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/nfs-ganesha.repo.in (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/nfs-ganesha.spec.in (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/nfs-ganesha_build-ganesha.xml (100%) rename {nightly-builds => NEEDS_REVIEW/nightly-builds}/nfs-ganesha/nfs-ganesha_trigger-ganesha-builds.xml (100%) rename {posix_compliance => NEEDS_REVIEW/posix_compliance}/client.py (100%) rename {pynfs => NEEDS_REVIEW/pynfs}/client.py (100%) rename {pynfs => NEEDS_REVIEW/pynfs}/client.sh (100%) rename {pynfs => NEEDS_REVIEW/pynfs}/nfs_ganesha_pynfs.xml (100%) rename {small-file => NEEDS_REVIEW/small-file}/client.sh (100%) rename {small-file => NEEDS_REVIEW/small-file}/nfs_ganesha_small_file.xml (100%) delete mode 100644 build_scripts/build-tests/basic-gluster-duffy.sh delete mode 100644 build_scripts/code-compilation/basic-gluster-duffy.sh create mode 100644 build_scripts/common/basic-server-client.sh rename {jobs/scripts => build_scripts}/common/get-node.sh (100%) delete mode 100644 build_scripts/cthon04/basic-gluster-duffy.sh delete mode 100644 build_scripts/dbench/basic-gluster-duffy.sh delete mode 100644 build_scripts/ganesha-build/basic-gluster-duffy.sh delete mode 100644 build_scripts/iozone/basic-gluster-duffy.sh delete mode 100644 build_scripts/libntirpc-build/basic-gluster-duffy.sh rename {nightly-builds/libntirpc => build_scripts/libntirpc-build/libntirpc-template}/libntirpc.repo.in (100%) rename build_scripts/libntirpc-build/{template_files => libntirpc-template}/libntirpc.spec.in (100%) rename build_scripts/libntirpc-build/{template_files => libntirpc-template}/libntirpc_centos7.spec.in (100%) delete mode 100644 build_scripts/posix-compliance/basic-gluster-duffy.sh delete mode 100644 build_scripts/pylint/basic-gluster-duffy.sh delete mode 100644 build_scripts/pynfs/basic-gluster-duffy.sh delete mode 100644 build_scripts/small-file/basic-gluster-duffy.sh delete mode 100644 jobs/scripts/common/return-node.sh diff --git a/build-fsal_cephfs/bootstrap.py b/NEEDS_REVIEW/build-fsal_cephfs/bootstrap.py similarity index 100% rename from build-fsal_cephfs/bootstrap.py rename to NEEDS_REVIEW/build-fsal_cephfs/bootstrap.py diff --git a/build-fsal_cephfs/build-fsal_cephfs.sh b/NEEDS_REVIEW/build-fsal_cephfs/build-fsal_cephfs.sh similarity index 100% rename from build-fsal_cephfs/build-fsal_cephfs.sh rename to NEEDS_REVIEW/build-fsal_cephfs/build-fsal_cephfs.sh diff --git a/build-fsal_cephfs/nfs-ganesha_trigger-fsal_cephfs.xml b/NEEDS_REVIEW/build-fsal_cephfs/nfs-ganesha_trigger-fsal_cephfs.xml similarity index 100% rename from build-fsal_cephfs/nfs-ganesha_trigger-fsal_cephfs.xml rename to NEEDS_REVIEW/build-fsal_cephfs/nfs-ganesha_trigger-fsal_cephfs.xml diff --git a/build-fsal_gluster/bootstrap.py b/NEEDS_REVIEW/build-fsal_gluster/bootstrap.py similarity index 100% rename from build-fsal_gluster/bootstrap.py rename to NEEDS_REVIEW/build-fsal_gluster/bootstrap.py diff --git a/build-fsal_gluster/build-fsal_gluster.sh b/NEEDS_REVIEW/build-fsal_gluster/build-fsal_gluster.sh similarity index 100% rename from build-fsal_gluster/build-fsal_gluster.sh rename to NEEDS_REVIEW/build-fsal_gluster/build-fsal_gluster.sh diff --git a/build-fsal_gluster/nfs-ganesha_trigger-fsal_gluster.xml b/NEEDS_REVIEW/build-fsal_gluster/nfs-ganesha_trigger-fsal_gluster.xml similarity index 100% rename from build-fsal_gluster/nfs-ganesha_trigger-fsal_gluster.xml rename to NEEDS_REVIEW/build-fsal_gluster/nfs-ganesha_trigger-fsal_gluster.xml diff --git a/build-fsal_rgw/bootstrap.py b/NEEDS_REVIEW/build-fsal_rgw/bootstrap.py similarity index 100% rename from build-fsal_rgw/bootstrap.py rename to NEEDS_REVIEW/build-fsal_rgw/bootstrap.py diff --git a/build-fsal_rgw/build-fsal_rgw.sh b/NEEDS_REVIEW/build-fsal_rgw/build-fsal_rgw.sh similarity index 100% rename from build-fsal_rgw/build-fsal_rgw.sh rename to NEEDS_REVIEW/build-fsal_rgw/build-fsal_rgw.sh diff --git a/build-fsal_rgw/nfs-ganesha_trigger-fsal_rgw.xml b/NEEDS_REVIEW/build-fsal_rgw/nfs-ganesha_trigger-fsal_rgw.xml similarity index 100% rename from build-fsal_rgw/nfs-ganesha_trigger-fsal_rgw.xml rename to NEEDS_REVIEW/build-fsal_rgw/nfs-ganesha_trigger-fsal_rgw.xml diff --git a/build-pylint/bootstrap.py b/NEEDS_REVIEW/build-pylint/bootstrap.py similarity index 100% rename from build-pylint/bootstrap.py rename to NEEDS_REVIEW/build-pylint/bootstrap.py diff --git a/build-pylint/build-pylint.sh b/NEEDS_REVIEW/build-pylint/build-pylint.sh similarity index 100% rename from build-pylint/build-pylint.sh rename to NEEDS_REVIEW/build-pylint/build-pylint.sh diff --git a/build-pylint/nfs-ganesha_trigger-pylint.xml b/NEEDS_REVIEW/build-pylint/nfs-ganesha_trigger-pylint.xml similarity index 100% rename from build-pylint/nfs-ganesha_trigger-pylint.xml rename to NEEDS_REVIEW/build-pylint/nfs-ganesha_trigger-pylint.xml diff --git a/build-tests/bootstrap.py b/NEEDS_REVIEW/build-tests/bootstrap.py similarity index 100% rename from build-tests/bootstrap.py rename to NEEDS_REVIEW/build-tests/bootstrap.py diff --git a/build-tests/build-tests.sh b/NEEDS_REVIEW/build-tests/build-tests.sh similarity index 100% rename from build-tests/build-tests.sh rename to NEEDS_REVIEW/build-tests/build-tests.sh diff --git a/build-tests/nfs-ganesha_trigger-tests.xml b/NEEDS_REVIEW/build-tests/nfs-ganesha_trigger-tests.xml similarity index 100% rename from build-tests/nfs-ganesha_trigger-tests.xml rename to NEEDS_REVIEW/build-tests/nfs-ganesha_trigger-tests.xml diff --git a/checkpatch/.checkpatch.conf b/NEEDS_REVIEW/checkpatch/.checkpatch.conf similarity index 100% rename from checkpatch/.checkpatch.conf rename to NEEDS_REVIEW/checkpatch/.checkpatch.conf diff --git a/checkpatch/checkpatch-to-gerrit-json.py b/NEEDS_REVIEW/checkpatch/checkpatch-to-gerrit-json.py similarity index 100% rename from checkpatch/checkpatch-to-gerrit-json.py rename to NEEDS_REVIEW/checkpatch/checkpatch-to-gerrit-json.py diff --git a/checkpatch/checkpatch.pl b/NEEDS_REVIEW/checkpatch/checkpatch.pl similarity index 100% rename from checkpatch/checkpatch.pl rename to NEEDS_REVIEW/checkpatch/checkpatch.pl diff --git a/checkpatch/jenkins.sh b/NEEDS_REVIEW/checkpatch/jenkins.sh similarity index 100% rename from checkpatch/jenkins.sh rename to NEEDS_REVIEW/checkpatch/jenkins.sh diff --git a/checkpatch/spelling.txt b/NEEDS_REVIEW/checkpatch/spelling.txt similarity index 100% rename from checkpatch/spelling.txt rename to NEEDS_REVIEW/checkpatch/spelling.txt diff --git a/client-permissions/client.sh b/NEEDS_REVIEW/client-permissions/client.sh similarity index 100% rename from client-permissions/client.sh rename to NEEDS_REVIEW/client-permissions/client.sh diff --git a/client-permissions/duffy.py b/NEEDS_REVIEW/client-permissions/duffy.py similarity index 100% rename from client-permissions/duffy.py rename to NEEDS_REVIEW/client-permissions/duffy.py diff --git a/client-permissions/server.sh b/NEEDS_REVIEW/client-permissions/server.sh similarity index 100% rename from client-permissions/server.sh rename to NEEDS_REVIEW/client-permissions/server.sh diff --git a/code-compilation/client.sh b/NEEDS_REVIEW/code-compilation/client.sh similarity index 100% rename from code-compilation/client.sh rename to NEEDS_REVIEW/code-compilation/client.sh diff --git a/common-scripts/add-gerrit-comment.sh b/NEEDS_REVIEW/common-scripts/add-gerrit-comment.sh similarity index 100% rename from common-scripts/add-gerrit-comment.sh rename to NEEDS_REVIEW/common-scripts/add-gerrit-comment.sh diff --git a/common-scripts/basic-gluster-duffy.py b/NEEDS_REVIEW/common-scripts/basic-gluster-duffy.py similarity index 100% rename from common-scripts/basic-gluster-duffy.py rename to NEEDS_REVIEW/common-scripts/basic-gluster-duffy.py diff --git a/common-scripts/basic-gluster.sh b/NEEDS_REVIEW/common-scripts/basic-gluster.sh similarity index 100% rename from common-scripts/basic-gluster.sh rename to NEEDS_REVIEW/common-scripts/basic-gluster.sh diff --git a/common-scripts/basic-vfs-duffy.py b/NEEDS_REVIEW/common-scripts/basic-vfs-duffy.py similarity index 100% rename from common-scripts/basic-vfs-duffy.py rename to NEEDS_REVIEW/common-scripts/basic-vfs-duffy.py diff --git a/common-scripts/basic-vfs-minmd.sh b/NEEDS_REVIEW/common-scripts/basic-vfs-minmd.sh similarity index 100% rename from common-scripts/basic-vfs-minmd.sh rename to NEEDS_REVIEW/common-scripts/basic-vfs-minmd.sh diff --git a/common-scripts/basic-vfs.sh b/NEEDS_REVIEW/common-scripts/basic-vfs.sh similarity index 100% rename from common-scripts/basic-vfs.sh rename to NEEDS_REVIEW/common-scripts/basic-vfs.sh diff --git a/cthon04/client.sh b/NEEDS_REVIEW/cthon04/client.sh similarity index 100% rename from cthon04/client.sh rename to NEEDS_REVIEW/cthon04/client.sh diff --git a/cthon04/nfs_ganesha_cthon04.xml b/NEEDS_REVIEW/cthon04/nfs_ganesha_cthon04.xml similarity index 100% rename from cthon04/nfs_ganesha_cthon04.xml rename to NEEDS_REVIEW/cthon04/nfs_ganesha_cthon04.xml diff --git a/dbench/client.sh b/NEEDS_REVIEW/dbench/client.sh similarity index 100% rename from dbench/client.sh rename to NEEDS_REVIEW/dbench/client.sh diff --git a/iozone/client.sh b/NEEDS_REVIEW/iozone/client.sh similarity index 100% rename from iozone/client.sh rename to NEEDS_REVIEW/iozone/client.sh diff --git a/labelled_nfs/client.sh b/NEEDS_REVIEW/labelled_nfs/client.sh similarity index 100% rename from labelled_nfs/client.sh rename to NEEDS_REVIEW/labelled_nfs/client.sh diff --git a/labelled_nfs/nfs_ganesha_labelled_nfs.xml b/NEEDS_REVIEW/labelled_nfs/nfs_ganesha_labelled_nfs.xml similarity index 100% rename from labelled_nfs/nfs_ganesha_labelled_nfs.xml rename to NEEDS_REVIEW/labelled_nfs/nfs_ganesha_labelled_nfs.xml diff --git a/nfs-ganesha_trigger-cthon04-on-new-patch.xml b/NEEDS_REVIEW/nfs-ganesha_trigger-cthon04-on-new-patch.xml similarity index 100% rename from nfs-ganesha_trigger-cthon04-on-new-patch.xml rename to NEEDS_REVIEW/nfs-ganesha_trigger-cthon04-on-new-patch.xml diff --git a/nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml b/NEEDS_REVIEW/nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml similarity index 100% rename from nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml rename to NEEDS_REVIEW/nfs-ganesha_trigger-on-new-build_next-el7-x86_64.xml diff --git a/nightly-builds/libntirpc/build.sh b/NEEDS_REVIEW/nightly-builds/libntirpc/build.sh similarity index 100% rename from nightly-builds/libntirpc/build.sh rename to NEEDS_REVIEW/nightly-builds/libntirpc/build.sh diff --git a/nightly-builds/libntirpc/jenkins-job.py b/NEEDS_REVIEW/nightly-builds/libntirpc/jenkins-job.py similarity index 100% rename from nightly-builds/libntirpc/jenkins-job.py rename to NEEDS_REVIEW/nightly-builds/libntirpc/jenkins-job.py diff --git a/build_scripts/libntirpc-build/template_files/libntirpc.repo.in b/NEEDS_REVIEW/nightly-builds/libntirpc/libntirpc.repo.in similarity index 100% rename from build_scripts/libntirpc-build/template_files/libntirpc.repo.in rename to NEEDS_REVIEW/nightly-builds/libntirpc/libntirpc.repo.in diff --git a/nightly-builds/libntirpc/libntirpc.spec.in b/NEEDS_REVIEW/nightly-builds/libntirpc/libntirpc.spec.in similarity index 100% rename from nightly-builds/libntirpc/libntirpc.spec.in rename to NEEDS_REVIEW/nightly-builds/libntirpc/libntirpc.spec.in diff --git a/nightly-builds/libntirpc/nfs-ganesha_build-libntirpc.xml b/NEEDS_REVIEW/nightly-builds/libntirpc/nfs-ganesha_build-libntirpc.xml similarity index 100% rename from nightly-builds/libntirpc/nfs-ganesha_build-libntirpc.xml rename to NEEDS_REVIEW/nightly-builds/libntirpc/nfs-ganesha_build-libntirpc.xml diff --git a/nightly-builds/libntirpc/nfs-ganesha_trigger-libntirpc-builds.xml b/NEEDS_REVIEW/nightly-builds/libntirpc/nfs-ganesha_trigger-libntirpc-builds.xml similarity index 100% rename from nightly-builds/libntirpc/nfs-ganesha_trigger-libntirpc-builds.xml rename to NEEDS_REVIEW/nightly-builds/libntirpc/nfs-ganesha_trigger-libntirpc-builds.xml diff --git a/nightly-builds/nfs-ganesha/build.sh b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/build.sh similarity index 100% rename from nightly-builds/nfs-ganesha/build.sh rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/build.sh diff --git a/nightly-builds/nfs-ganesha/jenkins-job.py b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/jenkins-job.py similarity index 100% rename from nightly-builds/nfs-ganesha/jenkins-job.py rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/jenkins-job.py diff --git a/nightly-builds/nfs-ganesha/nfs-ganesha.repo.in b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha.repo.in similarity index 100% rename from nightly-builds/nfs-ganesha/nfs-ganesha.repo.in rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha.repo.in diff --git a/nightly-builds/nfs-ganesha/nfs-ganesha.spec.in b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha.spec.in similarity index 100% rename from nightly-builds/nfs-ganesha/nfs-ganesha.spec.in rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha.spec.in diff --git a/nightly-builds/nfs-ganesha/nfs-ganesha_build-ganesha.xml b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha_build-ganesha.xml similarity index 100% rename from nightly-builds/nfs-ganesha/nfs-ganesha_build-ganesha.xml rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha_build-ganesha.xml diff --git a/nightly-builds/nfs-ganesha/nfs-ganesha_trigger-ganesha-builds.xml b/NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha_trigger-ganesha-builds.xml similarity index 100% rename from nightly-builds/nfs-ganesha/nfs-ganesha_trigger-ganesha-builds.xml rename to NEEDS_REVIEW/nightly-builds/nfs-ganesha/nfs-ganesha_trigger-ganesha-builds.xml diff --git a/posix_compliance/client.py b/NEEDS_REVIEW/posix_compliance/client.py similarity index 100% rename from posix_compliance/client.py rename to NEEDS_REVIEW/posix_compliance/client.py diff --git a/pynfs/client.py b/NEEDS_REVIEW/pynfs/client.py similarity index 100% rename from pynfs/client.py rename to NEEDS_REVIEW/pynfs/client.py diff --git a/pynfs/client.sh b/NEEDS_REVIEW/pynfs/client.sh similarity index 100% rename from pynfs/client.sh rename to NEEDS_REVIEW/pynfs/client.sh diff --git a/pynfs/nfs_ganesha_pynfs.xml b/NEEDS_REVIEW/pynfs/nfs_ganesha_pynfs.xml similarity index 100% rename from pynfs/nfs_ganesha_pynfs.xml rename to NEEDS_REVIEW/pynfs/nfs_ganesha_pynfs.xml diff --git a/small-file/client.sh b/NEEDS_REVIEW/small-file/client.sh similarity index 100% rename from small-file/client.sh rename to NEEDS_REVIEW/small-file/client.sh diff --git a/small-file/nfs_ganesha_small_file.xml b/NEEDS_REVIEW/small-file/nfs_ganesha_small_file.xml similarity index 100% rename from small-file/nfs_ganesha_small_file.xml rename to NEEDS_REVIEW/small-file/nfs_ganesha_small_file.xml diff --git a/build_scripts/build-tests/basic-gluster-duffy.sh b/build_scripts/build-tests/basic-gluster-duffy.sh deleted file mode 100644 index 9dbc3d16..00000000 --- a/build_scripts/build-tests/basic-gluster-duffy.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -TEST_SCRIPT=${TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" -server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'" -server_env+=" YUM_REPO='${YUM_REPO}'" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE != 0 ]; then - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/code-compilation/basic-gluster-duffy.sh b/build_scripts/code-compilation/basic-gluster-duffy.sh deleted file mode 100644 index ec5d4131..00000000 --- a/build_scripts/code-compilation/basic-gluster-duffy.sh +++ /dev/null @@ -1,48 +0,0 @@ -l!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} -GERRIT_HOST=${GERRIT_HOST} -GERRIT_PROJECT=${GERRIT_PROJECT} -GERRIT_REFSPEC=${GERRIT_REFSPEC} -CENTOS_VERSION=${CENTOS_VERSION} -CENTOS_ARCH=${CENTOS_ARCH} -GLUSTER_VOLUME=${EXPORT} - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "GERRIT_HOST='${GERRIT_HOST}' GERRIT_PROJECT='${GERRIT_PROJECT}' GERRIT_REFSPEC='${GERRIT_REFSPEC}' CENTOS_VERSION='${CENTOS_VERSION}' GLUSTER_VOLUME='${EXPORT}' YUM_REPO='${YUM_REPO}' bash ./$(basename ${SERVER_TEST_SCRIPT})" - -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${CLIENT_IP}:./ssh-privatekey - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} 'chmod 0600 ./ssh-privatekey' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - set +x - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "SERVER='${SERVER_IP}' EXPORT='/${EXPORT}' CENTOS_VERSION='${CENTOS_VERSION}' bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - echo "Checking if the process had crashed!" - CHECK_SERVER_PROCESS=$(ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "ps ax | grep ganesha | grep -v grep") - if [ -z "${CHECK_SERVER_PROCESS}" ]; then - echo "No process was found" - fi - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/common/basic-server-client.sh b/build_scripts/common/basic-server-client.sh new file mode 100644 index 00000000..65ce4ff9 --- /dev/null +++ b/build_scripts/common/basic-server-client.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +function server_run() +{ + if [ "$JOB_NAME" == "iozone-vfs" ] || [ "$JOB_NAME" == "iozone-vfs-minmdcache" ]; then + VOLUME_TYPE="VFS" + else + VOLUME_TYPE="GLUSTER" + fi + + if [ "$JOB_NAME" == "pynfs-acl" ]; then + INCLUDE_ACL_PARAM=" ENABLE_ACL='${ENABLE_ACL}'" + fi + + scp ${SSH_OPTIONS} ${2} root@${1}:./$(basename ${2}) + + ssh -t ${SSH_OPTIONS} root@${1} "GERRIT_HOST='${GERRIT_HOST}' GERRIT_PROJECT='${GERRIT_PROJECT}' GERRIT_REFSPEC='${GERRIT_REFSPEC}' CENTOS_VERSION='${CENTOS_VERSION}' CENTOS_ARCH='${CENTOS_ARCH}' ${VOLUME_TYPE}_VOLUME='${EXPORT}' YUM_REPO='${YUM_REPO}' ${INCLUDE_TEMPLATE_URL} ${INCLUDE_ACL_PARAM} bash ./$(basename ${2})" + RETURN_CODE=$? + + return $RETURN_CODE +} + +function client_run() +{ + scp ${SSH_OPTIONS} ${2} root@${1}:./$(basename ${2}) + + if [ "${JOB_NAME}" == "pynfs" ] || [ "${JOB_NAME}" == "pynfs-acl" ]; then + INCLUDE_TEST_PARAMS="TEST_PARAMETERS='${TEST_PARAMETERS}'" + fi + + ssh -t ${SSH_OPTIONS} root@${1} "SERVER='${3}' EXPORT='/${EXPORT}' CENTOS_VERSION='${CENTOS_VERSION}' ${INCLUDE_TEST_PARAMS} bash ./$(basename ${2})" + RETURN_CODE_CLIENT=$? + + return $RETURN_CODE_CLIENT +} + +SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') + +if [ "${TEST_SCRIPT}" ]; then + if [ "${TEMPLATES_URL}" ]; then + TEMPLATES_FOLDER=$(basename ${TEMPLATES_URL}) + #Copy the private key to the Server and Give appropriate permission to the file + scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${SERVER_IP}:./ssh-private-key + ssh -t ${SSH_OPTIONS} root@${SERVER_IP} 'chmod 0600 ~/ssh-private-key' + scp ${SSH_OPTIONS} -r ${TEMPLATES_URL} root@${SERVER_IP}: + INCLUDE_TEMPLATE_URL="TEMPLATES_URL='/root/${TEMPLATES_FOLDER}'" + fi + server_run ${SERVER_IP} ${TEST_SCRIPT} + FINAL_RESULT=$? +elif [ "${SERVER_TEST_SCRIPT}" ] && [ "${CLIENT_TEST_SCRIPT}" ]; then + CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') + server_run ${SERVER_IP} ${SERVER_TEST_SCRIPT} + SERVER_SCRIPT_RESULT=$? + if [ "${SERVER_SCRIPT_RESULT}" == "0" ]; then + echo "Server script success!" + client_run ${CLIENT_IP} ${CLIENT_TEST_SCRIPT} ${SERVER_IP} + FINAL_RESULT=$? + else + FINAL_RESULT=${SERVER_SCRIPT_RESULT} + fi +fi + +exit ${FINAL_RESULT} diff --git a/jobs/scripts/common/get-node.sh b/build_scripts/common/get-node.sh similarity index 100% rename from jobs/scripts/common/get-node.sh rename to build_scripts/common/get-node.sh diff --git a/build_scripts/common/return-node.sh b/build_scripts/common/return-node.sh index 22a52223..9a2abfe8 100644 --- a/build_scripts/common/return-node.sh +++ b/build_scripts/common/return-node.sh @@ -1,9 +1,8 @@ -# cico-node-done-from-ansible.sh -# A script that releases nodes from a SSID file written by +#!/bin/bash +# A script that releases nodes from session ids + set +x -SSID_FILE=${SSID_FILE:-$WORKSPACE/cico-ssid} -for ssid in $(cat ${SSID_FILE}) -do - cico -q node done $ssid -done +SESSION_ID=$(cat "${WORKSPACE}"/session_id) + +duffy client retire-session "${SESSION_ID}" > /dev/null diff --git a/build_scripts/cthon04/basic-gluster-duffy.sh b/build_scripts/cthon04/basic-gluster-duffy.sh deleted file mode 100644 index 020bb3b4..00000000 --- a/build_scripts/cthon04/basic-gluster-duffy.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" YUM_REPO='${YUM_REPO}'" -server_env+=" GLUSTER_VOLUME='${EXPORT}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/dbench/basic-gluster-duffy.sh b/build_scripts/dbench/basic-gluster-duffy.sh deleted file mode 100644 index 8866239a..00000000 --- a/build_scripts/dbench/basic-gluster-duffy.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" YUM_REPO='${YUM_REPO}'" - -if [ $CENTOS_VERSION ]; then - server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" -fi - -if [ "$JOB_NAME" == "nfs_ganesha_iozone_vfs" ] || [ "$JOB_NAME" == "nfs_ganesha_iozone_vfs_minmdcache" ]; then - server_env+=" VFS_VOLUME='${EXPORT}'" -else - server_env+=" GLUSTER_VOLUME='${EXPORT}'" -fi - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - sleep 180 - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/ganesha-build/basic-gluster-duffy.sh b/build_scripts/ganesha-build/basic-gluster-duffy.sh deleted file mode 100644 index 829ead73..00000000 --- a/build_scripts/ganesha-build/basic-gluster-duffy.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -TEST_SCRIPT=${TEST_SCRIPT} - -CENTOS_VERSION=${CENTOS_VERSION} -CENTOS_ARCH=${CENTOS_ARCH} -TEMPLATES_URL=${TEMPLATES_URL} -TEMPLATES_FOLDER=$(basename ${TEMPLATES_URL}) - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') - -#Copy the private key to the Server and Give appropriate permission to the file -scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${SERVER_IP}:./ssh-private-key -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} 'chmod 0600 ~/ssh-private-key' - -#Copy the TEST_SCRIPT to the Server -scp ${SSH_OPTIONS} ${TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${TEST_SCRIPT}) - -#Copy the template files -scp ${SSH_OPTIONS} -r ${TEMPLATES_URL} root@${SERVER_IP}: - -#Execute the Script on the server -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "CENTOS_VERSION='${CENTOS_VERSION}' CENTOS_ARCH='${CENTOS_ARCH}' TEMPLATES_URL='/root/${TEMPLATES_FOLDER}' bash $(basename ${TEST_SCRIPT})" -RETURN_CODE=$? - -#Copy the logs/rpms to the workspace -#scp ${SSH_OPTIONS} -r root@${SERVER_IP}:/srv/nightly/libntirpc/next/${CENTOS_VERSION}/${CENTOS_ARCH} $WORKSPACE/ - -exit $RETURN_CODE diff --git a/build_scripts/ganesha-build/build-ganesha.sh b/build_scripts/ganesha-build/build-ganesha.sh index c155b334..97a275de 100644 --- a/build_scripts/ganesha-build/build-ganesha.sh +++ b/build_scripts/ganesha-build/build-ganesha.sh @@ -2,6 +2,7 @@ artifact() { + rm -rf ${RESULTDIR}/*.log [ -e ~/ssh-private-key ] || return 0 scp -q -o StrictHostKeyChecking=no -i ~/ssh-private-key -r "${@}" nfs-ganesha@artifacts.ci.centos.org:/srv/artifacts/nfs-ganesha/ } diff --git a/build_scripts/iozone/basic-gluster-duffy.sh b/build_scripts/iozone/basic-gluster-duffy.sh deleted file mode 100644 index 6e6c20b7..00000000 --- a/build_scripts/iozone/basic-gluster-duffy.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" YUM_REPO='${YUM_REPO}'" - -if [ $CENTOS_VERSION ]; then - server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" -fi - -if [ "$JOB_NAME" == "iozone-vfs" ] || [ "$JOB_NAME" == "iozone-vfs-minmdcache" ]; then - server_env+=" VFS_VOLUME='${EXPORT}'" -else - server_env+=" GLUSTER_VOLUME='${EXPORT}'" -fi - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/libntirpc-build/basic-gluster-duffy.sh b/build_scripts/libntirpc-build/basic-gluster-duffy.sh deleted file mode 100644 index 3ec264a8..00000000 --- a/build_scripts/libntirpc-build/basic-gluster-duffy.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -TEST_SCRIPT=${TEST_SCRIPT} - -CENTOS_VERSION=${CENTOS_VERSION} -CENTOS_ARCH=${CENTOS_ARCH} -TEMPLATES_URL=${TEMPLATES_URL} -TEMPLATES_FOLDER=$(basename ${TEMPLATES_URL}) - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') - -#Copy the private key to the Server and Give appropriate permission to the file -scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${SERVER_IP}:./ssh-private-key -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} 'chmod 0600 ~/ssh-private-key' - -#Copy the TEST_SCRIPT to the Server -scp ${SSH_OPTIONS} ${TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${TEST_SCRIPT}) - -#Copy the template files -scp ${SSH_OPTIONS} -r ${TEMPLATES_URL} root@${SERVER_IP}: - -#Execute the Script on the server -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "CENTOS_VERSION='${CENTOS_VERSION}' CENTOS_ARCH='${CENTOS_ARCH}' TEMPLATES_URL='/root/${TEMPLATES_FOLDER}' bash $(basename ${TEST_SCRIPT})" -RETURN_CODE=$? - -#Copy the logs/rpms to the workspace -#scp ${SSH_OPTIONS} -r root@${SERVER_IP}:/srv/nightly/libntirpc/next/${CENTOS_VERSION//s}/${CENTOS_ARCH} $WORKSPACE/ - -exit $RETURN_CODE diff --git a/nightly-builds/libntirpc/libntirpc.repo.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc.repo.in similarity index 100% rename from nightly-builds/libntirpc/libntirpc.repo.in rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc.repo.in diff --git a/build_scripts/libntirpc-build/template_files/libntirpc.spec.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc.spec.in similarity index 100% rename from build_scripts/libntirpc-build/template_files/libntirpc.spec.in rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc.spec.in diff --git a/build_scripts/libntirpc-build/template_files/libntirpc_centos7.spec.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc_centos7.spec.in similarity index 100% rename from build_scripts/libntirpc-build/template_files/libntirpc_centos7.spec.in rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc_centos7.spec.in diff --git a/build_scripts/posix-compliance/basic-gluster-duffy.sh b/build_scripts/posix-compliance/basic-gluster-duffy.sh deleted file mode 100644 index 6dc442bf..00000000 --- a/build_scripts/posix-compliance/basic-gluster-duffy.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" -server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'" -server_env+=" GLUSTER_VOLUME='${EXPORT}'" -server_env+=" YUM_REPO='${YUM_REPO}'" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/pylint/basic-gluster-duffy.sh b/build_scripts/pylint/basic-gluster-duffy.sh deleted file mode 100644 index 9dbc3d16..00000000 --- a/build_scripts/pylint/basic-gluster-duffy.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -TEST_SCRIPT=${TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" -server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'" -server_env+=" YUM_REPO='${YUM_REPO}'" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE != 0 ]; then - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/pylint/build-pylint.sh b/build_scripts/pylint/build-pylint.sh index 9f7a6eaf..40693f49 100644 --- a/build_scripts/pylint/build-pylint.sh +++ b/build_scripts/pylint/build-pylint.sh @@ -13,10 +13,8 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG for pylint if [ "$CENTOS_VERSION" == "7" ]; then yum -y install centos-release-nfs-ganesha28 -elif [ "$CENTOS_VERSION" == "8s" ]; then +elif [ "$CENTOS_VERSION" == "8s" ] || [ "$CENTOS_VERSION" == "9s" ]; then yum -y install epel-release -else - echo "Please check the CENTOS_VERSION! The build implementation for this version=${CENTOS_VERSION} is in progress!" fi # basic packages to install diff --git a/build_scripts/pynfs/basic-gluster-duffy.sh b/build_scripts/pynfs/basic-gluster-duffy.sh deleted file mode 100644 index faa76d8e..00000000 --- a/build_scripts/pynfs/basic-gluster-duffy.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" YUM_REPO='${YUM_REPO}'" -server_env+=" GLUSTER_VOLUME='${EXPORT}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - -if [ "$JOB_NAME" == "pynfs-acl" ]; then - server_env+=" ENABLE_ACL='${ENABLE_ACL}'" -fi - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" TEST_PARAMETERS='${TEST_PARAMETERS}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/build_scripts/pynfs/client.sh b/build_scripts/pynfs/client.sh index e23820c7..f0d613c6 100644 --- a/build_scripts/pynfs/client.sh +++ b/build_scripts/pynfs/client.sh @@ -17,7 +17,7 @@ set -x [ -n "${TEST_PARAMETERS}" ] # install build and runtime dependencies -yum -y install git gcc nfs-utils redhat-rpm-config krb5-devel python3 +yum -y install git gcc nfs-utils redhat-rpm-config krb5-devel python3-devel python3-gssapi python3-ply rm -rf /root/pynfs && git clone git://linux-nfs.org/~bfields/pynfs.git @@ -28,13 +28,14 @@ set +e LOG_FILE40="/tmp/pynfs"$(date +%s)".log" cd /root/pynfs/nfs4.0 -timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" -TIMED_OUT=$? +./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" +#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" +#TIMED_OUT=$? #Return code will be 124 if it ends the process by using SIGTERM for not getting any response. 137 when used SIGKILL to kill the process -if [ $TIMED_OUT == 137 ]; then - echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!" - exit 1 -fi +#if [ $TIMED_OUT == 137 ]; then +# echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!" +# exit 1 +#fi #cd /root/pynfs/nfs4.0 && ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" RETURN_CODE40=$? @@ -43,13 +44,14 @@ cat $LOG_FILE40 LOG_FILE41="/tmp/pynfs"$(date +%s)".log" cd /root/pynfs/nfs4.1 -timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" -TIMED_OUT=$? +./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" +#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" +#TIMED_OUT=$? #Return code will be 124 if it ends the process by using SIGTERM for not getting any response. 137 when used SIGKILL to kill the process -if [ $TIMED_OUT == 137 ]; then - echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!" - exit 1 -fi +#if [ $TIMED_OUT == 137 ]; then +# echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!" +# exit 1 +#fi #cd /root/pynfs/nfs4.1 && ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" RETURN_CODE41=$? diff --git a/build_scripts/small-file/basic-gluster-duffy.sh b/build_scripts/small-file/basic-gluster-duffy.sh deleted file mode 100644 index 020bb3b4..00000000 --- a/build_scripts/small-file/basic-gluster-duffy.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT} -CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT} - -server_env="export GERRIT_HOST='${GERRIT_HOST}'" -server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'" -server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'" -server_env+=" YUM_REPO='${YUM_REPO}'" -server_env+=" GLUSTER_VOLUME='${EXPORT}'" -server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - -SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p') -CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p') - -echo $server_env > $WORKSPACE/SERVER_ENV.txt - -SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -#add the export with environment to ~/.bashrc -scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt" - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt" - -scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT}) - -ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})" -RETURN_CODE=$? - -if [ $RETURN_CODE == 0 ]; then - client_env="export SERVER='${SERVER_IP}'" - client_env+=" EXPORT='/${EXPORT}'" - client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'" - - echo $client_env > $WORKSPACE/CLIENT_ENV.txt - - scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt" - - ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt' - - scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT}) - - ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})" - RETURN_CODE_CLIENT=$? - - exit $RETURN_CODE_CLIENT -else - echo "The SERVER script failed!" - exit $RETURN_CODE -fi diff --git a/jobs/code_compilation.yml b/jobs/code_compilation.yml index ac789832..9dee6687 100644 --- a/jobs/code_compilation.yml +++ b/jobs/code_compilation.yml @@ -31,7 +31,7 @@ option: 'code_compilation' builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/common.sh wrappers: diff --git a/jobs/cthon04.yml b/jobs/cthon04.yml index 13b4887a..a9188fb5 100644 --- a/jobs/cthon04.yml +++ b/jobs/cthon04.yml @@ -29,9 +29,9 @@ - centos_variables builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: | - bash $WORKSPACE/ci-tests/build_scripts/cthon04/basic-gluster-duffy.sh + bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh wrappers: - cleanup-ws diff --git a/jobs/dbench.yml b/jobs/dbench.yml index 9d3b4752..feafb964 100644 --- a/jobs/dbench.yml +++ b/jobs/dbench.yml @@ -31,7 +31,7 @@ option: 'dbench' builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/common.sh wrappers: diff --git a/jobs/fsal_template.yml b/jobs/fsal_template.yml index 88778991..e3f43d47 100644 --- a/jobs/fsal_template.yml +++ b/jobs/fsal_template.yml @@ -35,7 +35,7 @@ - shell: !include-raw-escape: scripts/fsal-build.sh builders: - - shell: !include-raw-escape: scripts/common/get-node.sh + - get-node - shell: !include-raw-escape: scripts/fsal-build.sh triggers: diff --git a/jobs/ganesha-build.yml b/jobs/ganesha-build.yml index 7f7715a1..960af818 100644 --- a/jobs/ganesha-build.yml +++ b/jobs/ganesha-build.yml @@ -27,9 +27,9 @@ - centos_variables builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: | - bash $WORKSPACE/ci-tests/build_scripts/ganesha-build/basic-gluster-duffy.sh + bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh wrappers: - gerrithub_key diff --git a/jobs/labelled_nfs.yml b/jobs/labelled_nfs.yml index 593f2b5e..e6234f6d 100644 --- a/jobs/labelled_nfs.yml +++ b/jobs/labelled_nfs.yml @@ -24,17 +24,12 @@ - centos_variables triggers: - - gerrit: - projects: - - project-compare-type: PLAIN - project-pattern: '' - branches: - - branch-pattern: '**' - branch-compare-type: ANT + - gerrithub-trigger: builders: + - get-node - shell: | - python $WORKSPACE/ci-tests/build_scripts/common/basic-gluster-duffy.py + bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh wrappers: - cleanup-ws diff --git a/jobs/libntirpc-build.yml b/jobs/libntirpc-build.yml index bfd24f2d..31833038 100644 --- a/jobs/libntirpc-build.yml +++ b/jobs/libntirpc-build.yml @@ -19,15 +19,15 @@ description: 'Test script to execute on the reserved machine.' name: TEST_SCRIPT - string: - default: "$WORKSPACE/ci-tests/build_scripts/libntirpc-build/template_files" + default: "$WORKSPACE/ci-tests/build_scripts/libntirpc-build/libntirpc-template" description: 'URL pointing to the directory with the templates for when building the source RPM and .repo file.' name: TEMPLATES_URL - centos_variables builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: | - bash $WORKSPACE/ci-tests/build_scripts/libntirpc-build/basic-gluster-duffy.sh + bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh wrappers: - cleanup-ws diff --git a/jobs/macros.yml b/jobs/macros.yml index d6497f3d..3212fc54 100644 --- a/jobs/macros.yml +++ b/jobs/macros.yml @@ -10,6 +10,11 @@ url: https://github.com/nfs-ganesha/ci-tests.git basedir: "$WORKSPACE/ci-tests" +- builder: + name: get-node + builders: + - shell: !include-raw: ../build_scripts/common/get-node.sh + - property: name: nfs-github properties: @@ -145,4 +150,4 @@ - log-text: Build was aborted operator: OR script: - !include-raw: scripts/common/return-node.sh + !include-raw: ../build_scripts/common/return-node.sh diff --git a/jobs/posix-compliance.yml b/jobs/posix-compliance.yml index 07305303..304c28fd 100644 --- a/jobs/posix-compliance.yml +++ b/jobs/posix-compliance.yml @@ -34,7 +34,7 @@ option: 'posix_compliance' builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/posix_compliance.sh wrappers: diff --git a/jobs/pylint.yml b/jobs/pylint.yml index c6905e3b..f2e011f1 100644 --- a/jobs/pylint.yml +++ b/jobs/pylint.yml @@ -26,7 +26,7 @@ option: 'pylint' builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/pylint.sh wrappers: diff --git a/jobs/pynfs-acl.yml b/jobs/pynfs-acl.yml index 98c419e1..ecc4fa71 100644 --- a/jobs/pynfs-acl.yml +++ b/jobs/pynfs-acl.yml @@ -37,7 +37,7 @@ name: ENABLE_ACL builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/common.sh triggers: diff --git a/jobs/pynfs.yml b/jobs/pynfs.yml index c6081f14..865387d4 100644 --- a/jobs/pynfs.yml +++ b/jobs/pynfs.yml @@ -33,7 +33,7 @@ - centos_variables builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/common.sh wrappers: @@ -42,7 +42,7 @@ triggers: - gerrithub-trigger: - option: 'pynfs' + option: 'pynfs$' publishers: - post_build_task_return-node diff --git a/jobs/scripts/common.sh b/jobs/scripts/common.sh index b11cb358..93e10b57 100644 --- a/jobs/scripts/common.sh +++ b/jobs/scripts/common.sh @@ -6,17 +6,7 @@ export GERRIT_REFSPEC=${GERRIT_REFSPEC} export LAST_TRIGGERED_JOB_NAME=$JOB_NAME export BUILD_NUMBER=${BUILD_NUMBER} -if [ "$JOB_NAME" == "dbench" ]; then - FOLDER_NAME="dbench" -elif [ "$JOB_NAME" == "code-compilation" ]; then - FOLDER_NAME="code-compilation" -elif [[ $JOB_NAME =~ iozone-* ]]; then - FOLDER_NAME="iozone" -elif [[ $JOB_NAME =~ pynfs(-)* ]]; then - FOLDER_NAME="pynfs" -fi - -bash $WORKSPACE/ci-tests/build_scripts/${FOLDER_NAME}/basic-gluster-duffy.sh +bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh RET=$? JOB_OUTPUT="${JENKINS_URL}/job/${LAST_TRIGGERED_JOB_NAME}/${BUILD_NUMBER}/console" diff --git a/jobs/scripts/common/return-node.sh b/jobs/scripts/common/return-node.sh deleted file mode 100644 index 9a2abfe8..00000000 --- a/jobs/scripts/common/return-node.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# A script that releases nodes from session ids - -set +x - -SESSION_ID=$(cat "${WORKSPACE}"/session_id) - -duffy client retire-session "${SESSION_ID}" > /dev/null diff --git a/jobs/scripts/posix_compliance.sh b/jobs/scripts/posix_compliance.sh index 41218da9..dd3b2c1a 100644 --- a/jobs/scripts/posix_compliance.sh +++ b/jobs/scripts/posix_compliance.sh @@ -7,7 +7,7 @@ export LAST_TRIGGERED_JOB_NAME=nfs_ganesha_posix_compliance export BUILD_NUMBER=${BUILD_NUMBER} set +e -bash $WORKSPACE/ci-tests/build_scripts/posix-compliance/basic-gluster-duffy.sh +bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh RET=$? set -e diff --git a/jobs/scripts/pylint.sh b/jobs/scripts/pylint.sh index 1927daf7..7d0e0087 100644 --- a/jobs/scripts/pylint.sh +++ b/jobs/scripts/pylint.sh @@ -5,7 +5,7 @@ set +x set +e # run the get-node script -bash $WORKSPACE/ci-tests/build_scripts/pylint/basic-gluster-duffy.sh +bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh RET=$? # we accept different return values diff --git a/jobs/scripts/tests.sh b/jobs/scripts/tests.sh index c808ff6c..2c3c1a62 100644 --- a/jobs/scripts/tests.sh +++ b/jobs/scripts/tests.sh @@ -5,7 +5,7 @@ set +x set +e # download and run the bootstrap script -bash $WORKSPACE/ci-tests/build_scripts/build-tests/basic-gluster-duffy.sh +bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh RET=$? # we accept different return values diff --git a/jobs/small-file.yml b/jobs/small-file.yml index dc18177c..13bfaf6a 100644 --- a/jobs/small-file.yml +++ b/jobs/small-file.yml @@ -31,9 +31,9 @@ option: 'small-file' builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: | - bash $WORKSPACE/ci-tests/build_scripts/small-file/basic-gluster-duffy.sh + bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh wrappers: - cleanup-ws diff --git a/jobs/template_iozone.yml b/jobs/template_iozone.yml index d4b8f1af..35c593a0 100644 --- a/jobs/template_iozone.yml +++ b/jobs/template_iozone.yml @@ -43,7 +43,7 @@ - centos_variables builders: - - shell: !include-raw-escape: scripts/common/get-node.sh + - get-node - shell: !include-raw-escape: scripts/common.sh triggers: diff --git a/jobs/trigger-cthon04-on-new-patch.yml b/jobs/trigger-cthon04-on-new-patch.yml index 82191492..3e813369 100644 --- a/jobs/trigger-cthon04-on-new-patch.yml +++ b/jobs/trigger-cthon04-on-new-patch.yml @@ -32,3 +32,6 @@ triggers: - gerrithub-trigger: option: 'cthon04' + + wrappers: + - gerrithub_key diff --git a/jobs/trigger-ganesha-builds.yml b/jobs/trigger-ganesha-builds.yml index 2353fd9d..ea8d44c6 100644 --- a/jobs/trigger-ganesha-builds.yml +++ b/jobs/trigger-ganesha-builds.yml @@ -11,7 +11,7 @@ scm: - git: branches: - - '**' + - 'refs/heads/next' url: https://github.com/nfs-ganesha/nfs-ganesha.git builders: diff --git a/jobs/trigger-tests.yml b/jobs/trigger-tests.yml index dc9f9c8b..22bba369 100644 --- a/jobs/trigger-tests.yml +++ b/jobs/trigger-tests.yml @@ -21,7 +21,7 @@ - centos_variables builders: - - shell: !include-raw: scripts/common/get-node.sh + - get-node - shell: !include-raw: scripts/tests.sh triggers: