diff --git a/build_scripts/common/basic-storage-scale.sh b/build_scripts/common/basic-storage-scale.sh index 4820864b..b411739b 100644 --- a/build_scripts/common/basic-storage-scale.sh +++ b/build_scripts/common/basic-storage-scale.sh @@ -39,8 +39,9 @@ aws configure set aws_secret_access_key ${AWS_SECRET_KEY} aws s3api get-object --bucket centos-ci --key "version_to_use.txt" "version_to_use.txt" VERSION_TO_USE=$(cat version_to_use.txt) echo ${VERSION_TO_USE} -aws s3api get-object --bucket centos-ci --key "${VERSION_TO_USE}" "Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip" -unzip Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip +aws s3api get-object --bucket centos-ci --key "${VERSION_TO_USE}" "${VERSION_TO_USE}" +mkdir INSTALL_PATH +unzip ${VERSION_TO_USE} -d INSTALLER_PATH/ ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N "" cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys @@ -56,31 +57,34 @@ for new_ip in $(echo $ip_address | awk -F '.' '{for(i=$4+1;i<=255;i++){print $1" echo "$USABLE_IP cesip1" >> /etc/hosts -INSTALLER_VERSION=$(echo ${VERSION_TO_USE/.zip/}) -chmod +x $INSTALLER_VERSION -./$INSTALLER_VERSION --silent +INSTALLER_VERSION=$(ls INSTALLER_PATH/ --ignore="*.md5" --ignore="*.README" --ignore="*.pgp") +INSTALLER=$(readlink -f INSTALLER_PATH/${INSTALLER_VERSION}) +chmod +x $INSTALLER +$INSTALLER --silent -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale setup -s 127.0.0.1 --storesecret; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale node add $(hostname) -n; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale node add $(hostname) -p; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale config protocols -e $USABLE_IP; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale node add -a $(hostname); -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale config gpfs -c $(hostname)_cluster; +export PATH="$PATH:$(readlink -f /usr/lpp/mmfs/*/ansible-toolkit/)" + +spectrumscale setup -s 127.0.0.1 --storesecret; +spectrumscale node add $(hostname) -n; +spectrumscale node add $(hostname) -p; +spectrumscale config protocols -e $USABLE_IP; +spectrumscale node add -a $(hostname); +spectrumscale config gpfs -c $(hostname)_cluster; dd if=/dev/zero of=/home/nsd1_c84f2u09-rhel88a1 bs=1M count=8192; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale nsd add -p $(hostname) -u dataAndMetadata -fs ${STORAGE_SCALE_VOLUME} -fg 1 /home/nsd1_c84f2u09-rhel88a1; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale config protocols -f ${STORAGE_SCALE_VOLUME} -m /ibm/${STORAGE_SCALE_VOLUME}; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale enable nfs; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale enable smb; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale callhome disable; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale config perfmon -r off; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale node list; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale install --precheck; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale install; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale deploy --precheck; -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale deploy; - -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale nsd list -/usr/lpp/mmfs/5.1.9.0/ansible-toolkit/spectrumscale filesystem list +spectrumscale nsd add -p $(hostname) -u dataAndMetadata -fs ${STORAGE_SCALE_VOLUME} -fg 1 /home/nsd1_c84f2u09-rhel88a1; +spectrumscale config protocols -f ${STORAGE_SCALE_VOLUME} -m /ibm/${STORAGE_SCALE_VOLUME}; +spectrumscale enable nfs; +spectrumscale enable smb; +spectrumscale callhome disable; +spectrumscale config perfmon -r off; +spectrumscale node list; +spectrumscale install --precheck; +spectrumscale install; +spectrumscale deploy --precheck; +spectrumscale deploy; + +spectrumscale nsd list +spectrumscale filesystem list #---------------------------------------------------------------------------------------------- #THE FOLLOWING LINES OF CODE CLONES THE SOURCE CODE, RPMBUILD AND INSTALLS THE RPMS diff --git a/globals/macros/macros.yml b/globals/macros/macros.yml index 268f6495..c9df585e 100644 --- a/globals/macros/macros.yml +++ b/globals/macros/macros.yml @@ -56,7 +56,7 @@ exclude-drafts: true exclude-no-code-change: true - comment-added-contains-event: - comment-contains-value: 'recheck all' + comment-contains-value: 'recheck {option}' projects: - project-compare-type: PLAIN project-pattern: 'ffilz/nfs-ganesha' @@ -146,7 +146,7 @@ name: terminate_stuck_build wrappers: - timeout: - timeout: 240 + timeout: 360 abort: true type: no-activity diff --git a/jobs/code_compilation.yml b/jobs/code_compilation.yml index cf41c79a..33940493 100644 --- a/jobs/code_compilation.yml +++ b/jobs/code_compilation.yml @@ -4,6 +4,7 @@ description: 'Run code compilation for nfs-ganesha against the latest build of Ganesha with FSAL_GLUSTER.' project-type: freestyle concurrent: true + disabled: true allow-manual-triggers: true scm: diff --git a/jobs/dbench.yml b/jobs/dbench.yml index c5bb62cd..54ffd65f 100644 --- a/jobs/dbench.yml +++ b/jobs/dbench.yml @@ -4,6 +4,7 @@ description: 'Run dbench test suite against the latest build of Ganesha with FSAL_GLUSTER.' project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: true scm: diff --git a/jobs/labelled_nfs.yml b/jobs/labelled_nfs.yml index 8dae82ef..deb76d2f 100644 --- a/jobs/labelled_nfs.yml +++ b/jobs/labelled_nfs.yml @@ -4,6 +4,7 @@ description: 'Start labelled_nfs test when a new patch is posted to GerritHub.' project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: false properties: diff --git a/jobs/posix-compliance.yml b/jobs/posix-compliance.yml index 020db5a0..e2b6ff35 100644 --- a/jobs/posix-compliance.yml +++ b/jobs/posix-compliance.yml @@ -4,6 +4,7 @@ description: "Run posix compliance testsuite (NFSv4.0) against the latest build of Ganesha with FSAL_GLUSTER.\n\nposix compliance test suite cloned from, https://github.com/ffilz/ntfs-3g-pjd-fstest.git" project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: true scm: diff --git a/jobs/pylint.yml b/jobs/pylint.yml index f8797823..b70f9c0e 100644 --- a/jobs/pylint.yml +++ b/jobs/pylint.yml @@ -4,6 +4,7 @@ description: 'Run dbench test suite against the latest build of Ganesha with FSAL_GLUSTER.' project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: true scm: diff --git a/jobs/scripts/common.sh b/jobs/scripts/common.sh index b813c9b8..c932f225 100644 --- a/jobs/scripts/common.sh +++ b/jobs/scripts/common.sh @@ -1,3 +1,9 @@ +# no need for verbose output +set +x + +# do not immediately fail on an error +set +e + export CENTOS_VERSION=${CENTOS_VERSION} export CENTOS_ARCH=${CENTOS_ARCH} export GERRIT_HOST=${GERRIT_HOST} @@ -58,3 +64,5 @@ then ${NOTIFY} \ ${GERRIT_PATCHSET_REVISION} fi + +exit ${EXIT} diff --git a/jobs/small-file.yml b/jobs/small-file.yml index 13bfaf6a..949d1879 100644 --- a/jobs/small-file.yml +++ b/jobs/small-file.yml @@ -4,6 +4,7 @@ description: 'Start Small_File test when a new patch is posted to GerritHub.' project-type: freestyle concurrent: flase + disabled: true allow-manual-triggers: false scm: diff --git a/jobs/storage-scale.yml b/jobs/storage-scale.yml index ce2f0e16..e0f01896 100644 --- a/jobs/storage-scale.yml +++ b/jobs/storage-scale.yml @@ -5,6 +5,7 @@ description: 'Run Storage Scale CI test' project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: true scm: diff --git a/jobs/template_iozone.yml b/jobs/template_iozone.yml index 41f4ed99..c09b41fc 100644 --- a/jobs/template_iozone.yml +++ b/jobs/template_iozone.yml @@ -20,6 +20,7 @@ project-type: freestyle concurrent: false allow-manual-triggers: true + disabled: true properties: - discarder diff --git a/jobs/trigger-cthon04-on-new-patch.yml b/jobs/trigger-cthon04-on-new-patch.yml index 15de5414..50ce12e9 100644 --- a/jobs/trigger-cthon04-on-new-patch.yml +++ b/jobs/trigger-cthon04-on-new-patch.yml @@ -23,9 +23,9 @@ predefined-parameters: | CENTOS_VERSION=8s CENTOS_ARCH=x86_64 - GERRIT_HOST=${GERRIT_HOST} - GERRIT_PROJECT=${GERRIT_PROJECT} - GERRIT_REFSPEC=${GERRIT_REFSPEC} + GERRIT_HOST=$GERRIT_HOST + GERRIT_PROJECT=$GERRIT_PROJECT + GERRIT_REFSPEC=$GERRIT_REFSPEC - shell: | bash $WORKSPACE/ci-tests/build_scripts/common/add-gerrit-comment.sh diff --git a/jobs/trigger-on-new-build_next-el7-x86_64.yml b/jobs/trigger-on-new-build_next-el7-x86_64.yml index a738db9e..b587f50c 100644 --- a/jobs/trigger-on-new-build_next-el7-x86_64.yml +++ b/jobs/trigger-on-new-build_next-el7-x86_64.yml @@ -4,6 +4,7 @@ decription: '[next/el7/x86_64] Trigger tests whenever a new automated build is available in the YUM repository.' project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: false properties: diff --git a/jobs/trigger-tests.yml b/jobs/trigger-tests.yml index ef7fa38d..9de08414 100644 --- a/jobs/trigger-tests.yml +++ b/jobs/trigger-tests.yml @@ -3,6 +3,7 @@ node: cico-workspace project-type: freestyle concurrent: false + disabled: true allow-manual-triggers: true scm: