Skip to content

Commit a09a2e5

Browse files
Rakshitha Kamathrakshithakamath94
Rakshitha Kamath
authored and
rakshithakamath94
committed
Update jobs
1 parent 05b4abf commit a09a2e5

19 files changed

+23
-46
lines changed

‎build_scripts/code-compilation/client.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ do
4545
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
4646
yum -y --enablerepo=crb install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel libuuid libuuid-devel
4747
fi
48-
timeout -s SIGKILL 240s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha
48+
timeout -s SIGKILL 600s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha
4949
TIMED_OUT=$?
50+
echo $TIMED_OUT
5051
#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
5152
if [ $TIMED_OUT == 137 ]; then
5253
echo -e "The process timed out after 1 minute!\nChecking the Server process to see if it has crashed!"

‎build_scripts/common/basic-server-client.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ elif [ "${SERVER_TEST_SCRIPT}" ] && [ "${CLIENT_TEST_SCRIPT}" ]; then
6969
echo "Server script success!"
7070
client_run ${CLIENT_IP} ${CLIENT_TEST_SCRIPT} ${SERVER_IP}
7171
FINAL_RESULT=$?
72+
echo "Client script status = $FINAL_RESULT"
7273
else
7374
scp root@${SERVER_IP}:/root/rpmbuild/BUILD/nfs-ganesha-5.4/CMakeFiles/CMakeOutput.log $WORKSPACE
7475
scp root@${SERVER_IP}:/root/rpmbuild/BUILD/nfs-ganesha-5.4/CMakeFiles/CMakeError.log $WORKSPACE

‎build_scripts/common/basic-storage-scale.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ chmod +x ./aws/*
3636
aws --version
3737
aws configure set aws_access_key_id ${AWS_ACCESS_KEY}
3838
aws configure set aws_secret_access_key ${AWS_SECRET_KEY}
39-
aws s3api get-object --bucket nfsganesha-ci --key "version_to_use.txt" "version_to_use.txt"
39+
aws s3api get-object --bucket centos-ci --key "version_to_use.txt" "version_to_use.txt"
4040
VERSION_TO_USE=$(cat version_to_use.txt)
4141
echo ${VERSION_TO_USE}
42-
aws s3api get-object --bucket nfsganesha-ci --key "${VERSION_TO_USE}" "Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip"
42+
aws s3api get-object --bucket centos-ci --key "${VERSION_TO_USE}" "Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip"
4343
unzip Storage_Scale_Developer-5.1.9.0-x86_64-Linux-install.zip
4444

4545
ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N ""

‎build_scripts/pynfs/client.sh

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
echo "Client Script"
88

9-
# if any command fails, the script should exit
10-
set -e
11-
129
# enable some more output
1310
set -x
1411

@@ -24,19 +21,9 @@ rm -rf /root/pynfs && git clone git://linux-nfs.org/~bfields/pynfs.git
2421
cd /root/pynfs && yes | python3 setup.py build > /tmp/output_tempfile.txt
2522
echo $?
2623

27-
set +e
28-
2924
LOG_FILE40="/tmp/pynfs"$(date +%s)".log"
3025
cd /root/pynfs/nfs4.0
3126
./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
32-
#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
33-
#TIMED_OUT=$?
34-
#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
35-
#if [ $TIMED_OUT == 137 ]; then
36-
# echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
37-
# exit 1
38-
#fi
39-
#cd /root/pynfs/nfs4.0 && ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
4027
RETURN_CODE40=$?
4128

4229
echo "pynfs 4.0 test output:"
@@ -45,18 +32,8 @@ cat $LOG_FILE40
4532
LOG_FILE41="/tmp/pynfs"$(date +%s)".log"
4633
cd /root/pynfs/nfs4.1
4734
./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
48-
#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
49-
#TIMED_OUT=$?
50-
#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
51-
#if [ $TIMED_OUT == 137 ]; then
52-
# echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
53-
# exit 1
54-
#fi
55-
#cd /root/pynfs/nfs4.1 && ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
5635
RETURN_CODE41=$?
5736

58-
set -e
59-
6037
echo "pynfs 4.1 test output:"
6138
cat $LOG_FILE41
6239

@@ -76,8 +53,5 @@ if [ $RETURN_CODE40 != 0 ] || [ $RETURN_CODE40 != 0 ]; then
7653
echo "pynfs 4.1 test suite failures:"
7754
echo "--------------------------"
7855
cat $LOG_FILE41 | grep FAILURE
79-
8056
exit 1
8157
fi
82-
83-
exit 0

‎jobs/macros.yml renamed to ‎globals/macros/macros.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- builder:
1414
name: get-node
1515
builders:
16-
- shell: !include-raw: ../build_scripts/common/get-node.sh
16+
- shell: !include-raw-verbatim: ../../build_scripts/common/get-node.sh
1717

1818
- property:
1919
name: nfs-github
@@ -56,7 +56,7 @@
5656
exclude-drafts: true
5757
exclude-no-code-change: true
5858
- comment-added-contains-event:
59-
comment-contains-value: 'recheck {option}'
59+
comment-contains-value: 'recheck all'
6060
projects:
6161
- project-compare-type: PLAIN
6262
project-pattern: 'ffilz/nfs-ganesha'
@@ -162,7 +162,7 @@
162162
- log-text: Build was aborted
163163
operator: OR
164164
script:
165-
!include-raw: ../build_scripts/common/return-node.sh
165+
!include-raw-verbatim: ../../build_scripts/common/return-node.sh
166166

167167
- publisher:
168168
name: archive_artifacts

‎jobs/checkpatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
name: GERRIT_USER
3333

3434
builders:
35-
- shell: !include-raw: scripts/checkpatch.sh
35+
- shell: !include-raw-verbatim: scripts/checkpatch.sh
3636

3737
triggers:
3838
- gerrit:

‎jobs/code_compilation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
builders:
3434
- get-node
35-
- shell: !include-raw: scripts/common.sh
35+
- shell: !include-raw-verbatim: scripts/common.sh
3636

3737
wrappers:
3838
- gerrithub_key

‎jobs/dbench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
builders:
3434
- get-node
35-
- shell: !include-raw: scripts/common.sh
35+
- shell: !include-raw-verbatim: scripts/common.sh
3636

3737
wrappers:
3838
- cleanup-ws

‎jobs/fsal_template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
builders:
3535

36-
- shell: !include-raw-escape: scripts/fsal-build.sh
36+
- shell: !include-raw-verbatim: scripts/fsal-build.sh
3737

3838
builders:
3939
- get-node
40-
- shell: !include-raw-escape: scripts/fsal-build.sh
40+
- shell: !include-raw-verbatim: scripts/fsal-build.sh
4141

4242
triggers:
4343
- gerrithub-trigger:

‎jobs/labelled_nfs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
triggers:
2727
- gerrithub-trigger:
28+
option: 'labelled_nfs'
2829

2930
builders:
3031
- get-node

‎jobs/posix-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
builders:
3737
- get-node
38-
- shell: !include-raw: scripts/posix_compliance.sh
38+
- shell: !include-raw-verbatim: scripts/posix_compliance.sh
3939

4040
wrappers:
4141
- gerrithub_key

‎jobs/pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
builders:
2929
- get-node
30-
- shell: !include-raw: scripts/pylint.sh
30+
- shell: !include-raw-verbatim: scripts/pylint.sh
3131

3232
wrappers:
3333
- gerrithub_key

‎jobs/pynfs-acl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
builders:
4040
- get-node
41-
- shell: !include-raw: scripts/common.sh
41+
- shell: !include-raw-verbatim: scripts/common.sh
4242

4343
triggers:
4444
- gerrithub-trigger:

‎jobs/pynfs-ceph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
builders:
3737
- get-node
38-
- shell: !include-raw: scripts/common.sh
38+
- shell: !include-raw-verbatim: scripts/common.sh
3939

4040
wrappers:
4141
- gerrithub_key

‎jobs/pynfs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
builders:
3636
- get-node
37-
- shell: !include-raw: scripts/common.sh
37+
- shell: !include-raw-verbatim: scripts/common.sh
3838

3939
wrappers:
4040
- gerrithub_key

‎jobs/storage-scale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
builders:
3131
- get-node
32-
- shell: !include-raw: scripts/common.sh
32+
- shell: !include-raw-verbatim: scripts/common.sh
3333

3434
wrappers:
3535
- cleanup-ws

‎jobs/template_iozone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
builders:
4646
- get-node
47-
- shell: !include-raw-escape: scripts/common.sh
47+
- shell: !include-raw-verbatim: scripts/common.sh
4848

4949
triggers:
5050
- gerrithub-trigger:

‎jobs/trigger-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
builders:
2424
- get-node
25-
- shell: !include-raw: scripts/tests.sh
25+
- shell: !include-raw-verbatim: scripts/tests.sh
2626

2727
triggers:
2828
- gerrithub-trigger:

‎tests/deploy-nfs-ganesha-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22
sed "s/JENKINS_API_KEY/$JENKINS_API_KEY/g" tests/jenkins.conf > jobs/jenkins.ini
3-
jenkins-jobs --conf jobs/jenkins.ini update jobs
3+
jenkins-jobs --allow-empty-variables --conf jobs/jenkins.ini update jobs/:globals/macros/

0 commit comments

Comments
 (0)