Skip to content

Commit 8ed5d89

Browse files
Rakshitha KamathRakshitha Kamath
Rakshitha Kamath
authored and
Rakshitha Kamath
committed
Update the checkpatch
Signed-off-by: Rakshitha Kamath <[email protected]>
1 parent cf571a6 commit 8ed5d89

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

build_scripts/code-compilation/client.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
-devel userspace-rcu libnsl2-devel libcephfs-devel#!/bin/sh
22
#
33
# Environment variables used:
44
# - SERVER: hostname or IP-address of the NFS-server
@@ -15,7 +15,7 @@ set -x
1515

1616
# install build and runtime dependencies
1717
echo "Install build and runtime dependencies"
18-
yum -y install nfs-utils git gcc time
18+
yum -y install nfs-utils git gcc time centos-release-gluster
1919

2020
# flag for commands which should run only once
2121
once=0
@@ -33,7 +33,9 @@ do
3333
if [ $once -eq 0 ]
3434
then
3535
if [ "${CENTOS_VERSION}" == "7" ]; then
36-
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config centos-release-gluster userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel
36+
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api epel-release libnsl2-devel libcephfs-devel
37+
yum clean all & yum clean metadata
38+
yum -y install userspace-rcu-devel
3739
elif [ "${CENTOS_VERSION}" == "8s" ]; then
3840
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
3941
yum -y --enablerepo=powertools install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel

jobs/nfs-ganesha_trigger-checkpatch.yml renamed to jobs/checkpatch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- job:
2-
name: nfs-ganesha_trigger-checkpatch
2+
name: checkpatch
33
node: cico-workspace
44
description: "Run checkpatch on nfs-ganesha. This job is triggered by sending a change to https://review.gerrithub.io/#/q/project:ffilz/nfs-ganesha for review\n\nNote: it is possible to retrigger a test for a change by including recheck checkpatch in a comment on GerritHub."
55
project-type: freestyle
@@ -51,4 +51,4 @@
5151
branch-compare-type: ANT
5252

5353
wrappers:
54-
- ssh-agent
54+
- gerrithub_key

jobs/scripts/checkpatch.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ if [[ -n "$GERRIT_REFSPEC" ]]; then
77
GERRIT_PUBLISH=true
88
fi
99

10-
#ssh -o 'StrictHostKeyChecking no' -p 29418 [email protected] -v
11-
1210
if ! [ -d nfs-ganesha ]; then
13-
GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone --depth=1 -o gerrit ssh://$GERRIT_USER@review.gerrithub.io:29418/ffilz/nfs-ganesha.git -v
11+
GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -i $GERRITHUB_KEY" git clone --depth=1 -o gerrit ssh://$GERRIT_USER@review.gerrithub.io:29418/ffilz/nfs-ganesha.git -v
1412
fi
1513

1614
( cd nfs-ganesha && git fetch gerrit $GERRIT_REF && git checkout $REVISION )
1715

1816
publish_checkpatch() {
19-
local SSH_GERRIT="ssh -p 29418 $GERRIT_USER@review.gerrithub.io"
17+
local SSH_GERRIT="ssh -p 29418 -i $GERRITHUB_KEY $GERRIT_USER@review.gerrithub.io"
2018
if [[ "$GERRIT_PUBLISH" == "true" ]]; then
2119
tee /proc/$$/fd/1 | $SSH_GERRIT "gerrit review --json --project ffilz/nfs-ganesha $REVISION"
2220
else

0 commit comments

Comments
 (0)