Update jobs

build_scripts/code-compilation/client.sh

@@ -45,8 +45,9 @@ do
           yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
           yum -y --enablerepo=crb install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel libuuid libuuid-devel
         fi
-        timeout -s SIGKILL 240s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha
+        timeout -s SIGKILL 600s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha
         TIMED_OUT=$?
+        echo $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 1 minute!\nChecking the Server process to see if it has crashed!"

build_scripts/common/basic-gluster.sh

@@ -28,6 +28,8 @@ set -e
 # be a little bit more verbose
 set -x
 
+exit 0
+
 # enable repositories
 yum -y install centos-release-gluster yum-utils centos-release-ceph epel-release 
 

build_scripts/common/basic-storage-scale.sh

@@ -36,10 +36,10 @@ chmod +x ./aws/*
 aws --version
 aws configure set aws_access_key_id ${AWS_ACCESS_KEY}
 aws configure set aws_secret_access_key ${AWS_SECRET_KEY}
-aws s3api get-object --bucket nfsganesha-ci --key "version_to_use.txt" "version_to_use.txt"
+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 nfsganesha-ci --key "${VERSION_TO_USE}" "Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip"
+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
 
 ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N ""

build_scripts/pynfs/client.sh

@@ -12,6 +12,8 @@ set -e
 # enable some more output
 set -x
 
+exit 1
+
 [ -n "${SERVER}" ]
 [ -n "${EXPORT}" ]
 [ -n "${TEST_PARAMETERS}" ]
@@ -24,19 +26,9 @@ rm -rf /root/pynfs && git clone git://linux-nfs.org/~bfields/pynfs.git
 cd /root/pynfs && yes | python3 setup.py build > /tmp/output_tempfile.txt
 echo $?
 
-set +e
-
 LOG_FILE40="/tmp/pynfs"$(date +%s)".log"
 cd /root/pynfs/nfs4.0
 ./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
-#cd /root/pynfs/nfs4.0 && ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
 RETURN_CODE40=$?
 
 echo "pynfs 4.0 test output:"
@@ -45,18 +37,8 @@ cat $LOG_FILE40
 LOG_FILE41="/tmp/pynfs"$(date +%s)".log"
 cd /root/pynfs/nfs4.1
 ./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 
-#cd /root/pynfs/nfs4.1 && ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
 RETURN_CODE41=$?
 
-set -e
-
 echo "pynfs 4.1 test output:"
 cat $LOG_FILE41
 
@@ -76,8 +58,5 @@ if [ $RETURN_CODE40 != 0 ] || [ $RETURN_CODE40 != 0 ]; then
     echo "pynfs 4.1 test suite failures:"
     echo "--------------------------"
     cat $LOG_FILE41 | grep FAILURE
-
     exit 1
 fi
-
-exit 0 

jobs/macros.yml → globals/macros/macros.yml

@@ -13,7 +13,7 @@
 - builder:
     name: get-node
     builders:
-    - shell: !include-raw: ../build_scripts/common/get-node.sh
+    - shell: !include-raw-verbatim: ../../build_scripts/common/get-node.sh
 
 - property:
     name: nfs-github
@@ -56,7 +56,7 @@
                 exclude-drafts: true
                 exclude-no-code-change: true
             - comment-added-contains-event:
-                comment-contains-value: 'recheck {option}'
+                comment-contains-value: 'recheck all'
           projects:
             - project-compare-type: PLAIN
               project-pattern: 'ffilz/nfs-ganesha'
@@ -162,7 +162,7 @@
             - log-text: Build was aborted
               operator: OR
           script:
-            !include-raw: ../build_scripts/common/return-node.sh
+            !include-raw-verbatim: ../../build_scripts/common/return-node.sh
 
 - publisher:
     name: archive_artifacts

jobs/checkpatch.yml

@@ -32,7 +32,7 @@
         name: GERRIT_USER 
 
     builders:
-    - shell: !include-raw: scripts/checkpatch.sh
+    - shell: !include-raw-verbatim: scripts/checkpatch.sh
 
     triggers:
       - gerrit:

jobs/code_compilation.yml

@@ -32,7 +32,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/dbench.yml

@@ -32,7 +32,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - cleanup-ws

jobs/fsal_template.yml

@@ -33,11 +33,11 @@
 
     builders:
 
-    - shell: !include-raw-escape: scripts/fsal-build.sh
+    - shell: !include-raw-verbatim: scripts/fsal-build.sh
 
     builders:
     - get-node
-    - shell: !include-raw-escape: scripts/fsal-build.sh
+    - shell: !include-raw-verbatim: scripts/fsal-build.sh
 
     triggers:
     -  gerrithub-trigger:

jobs/labelled_nfs.yml

@@ -25,6 +25,7 @@
 
     triggers:
     - gerrithub-trigger:
+        option: 'labelled_nfs'
 
     builders:
     - get-node

jobs/posix-compliance.yml

@@ -35,7 +35,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/posix_compliance.sh
+    - shell: !include-raw-verbatim: scripts/posix_compliance.sh
 
     wrappers:
     - gerrithub_key

jobs/pylint.yml

@@ -27,7 +27,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/pylint.sh
+    - shell: !include-raw-verbatim: scripts/pylint.sh
 
     wrappers:
     - gerrithub_key

jobs/pynfs-acl.yml

@@ -38,7 +38,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     triggers:
     - gerrithub-trigger:

jobs/pynfs-ceph.yml

@@ -35,7 +35,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/pynfs.yml

@@ -34,7 +34,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - gerrithub_key

jobs/storage-scale.yml

@@ -29,7 +29,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/common.sh
+    - shell: !include-raw-verbatim: scripts/common.sh
 
     wrappers:
     - cleanup-ws

jobs/template_iozone.yml

@@ -44,7 +44,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw-escape: scripts/common.sh  
+    - shell: !include-raw-verbatim: scripts/common.sh  
 
     triggers:
     - gerrithub-trigger:

jobs/trigger-tests.yml

@@ -22,7 +22,7 @@
 
     builders:
     - get-node
-    - shell: !include-raw: scripts/tests.sh
+    - shell: !include-raw-verbatim: scripts/tests.sh
 
     triggers:
     - gerrithub-trigger:

tests/deploy-nfs-ganesha-ci.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 sed "s/JENKINS_API_KEY/$JENKINS_API_KEY/g" tests/jenkins.conf > jobs/jenkins.ini
-jenkins-jobs --conf jobs/jenkins.ini update jobs
+jenkins-jobs --allow-empty-variables --conf jobs/jenkins.ini update jobs/:globals/macros/