Skip to content

Commit cf571a6

Browse files
Rakshitha KamathRakshitha Kamath
Rakshitha Kamath
authored and
Rakshitha Kamath
committed
Update the jobs fsal-cephfs, fsal-gluster and fsal-rgw
1 parent 19df33f commit cf571a6

File tree

10 files changed

+81
-73
lines changed

10 files changed

+81
-73
lines changed

‎build_scripts/build-fsal/bootstrap.sh

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
3+
echo "Hello from bootstrap.sh"
4+
5+
TEST_SCRIPT=${TEST_SCRIPT}
6+
7+
SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
8+
9+
server_env="export CENTOS_VERSION='${CENTOS_VERSION}'"
10+
server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'"
11+
server_env+=" GERRIT_HOST='${GERRIT_HOST}'"
12+
server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
13+
server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
14+
15+
echo $server_env > $WORKSPACE/SERVER_ENV.txt
16+
17+
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
18+
19+
ssh -t -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
20+
21+
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$TEST_SCRIPT" root@${SERVER_IP}:./build.sh
22+
23+
ssh -tt -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${SERVER_IP} 'bash build.sh'

‎build_scripts/build-fsal/build-fsal_cephfs.sh

+13-22
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,20 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1313
# enable the Storage SIG Gluster and Ceph repositories
1414
yum -y install centos-release-ceph
1515

16+
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel python2-devel"
17+
18+
BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel"
19+
1620
# basic packages to install
17-
xargs yum -y install <<< "
18-
git
19-
bison
20-
cmake
21-
dbus-devel
22-
flex
23-
gcc-c++
24-
git
25-
krb5-devel
26-
libacl-devel
27-
libblkid-devel
28-
libcap-devel
29-
libnfsidmap-devel
30-
libwbclient-devel
31-
redhat-rpm-config
32-
rpm-build
33-
libcephfs-devel
34-
librgw-devel
35-
xfsprogs-devel
36-
python2-devel
37-
userspace-rcu-devel
38-
"
21+
case "${CENTOS_VERSION}" in
22+
7)
23+
yum install -y ${BUILDREQUIRES} ${BUILDREQUIRES_EXTRA}
24+
;;
25+
8s)
26+
yum install -y ${BUILDREQUIRES}
27+
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
28+
;;
29+
esac
3930

4031
git clone --depth=1 ${GIT_REPO}
4132
cd $(basename "${GERRIT_PROJECT}")

‎build_scripts/build-fsal/build-fsal_gluster.sh

+13-21
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,20 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1313
# enable the Storage SIG Gluster and Ceph repositories
1414
yum -y install centos-release-gluster
1515

16+
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel python2-devel"
17+
18+
BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel"
19+
1620
# basic packages to install
17-
xargs yum -y install <<< "
18-
git
19-
bison
20-
cmake
21-
dbus-devel
22-
flex
23-
gcc-c++
24-
git
25-
krb5-devel
26-
libacl-devel
27-
libblkid-devel
28-
libcap-devel
29-
libnfsidmap-devel
30-
libwbclient-devel
31-
redhat-rpm-config
32-
rpm-build
33-
libgfapi-devel
34-
xfsprogs-devel
35-
python2-devel
36-
userspace-rcu-devel
37-
"
21+
case "${CENTOS_VERSION}" in
22+
7)
23+
yum install -y ${BUILDREQUIRES} ${BUILDREQUIRES_EXTRA}
24+
;;
25+
8s)
26+
yum install -y ${BUILDREQUIRES}
27+
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
28+
;;
29+
esac
3830

3931
git clone --depth=1 ${GIT_REPO}
4032
cd $(basename "${GERRIT_PROJECT}")

‎build_scripts/build-fsal/build-fsal_rgw.sh

+19-22
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,26 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1313
# enable the Storage SIG Gluster and Ceph repositories
1414
yum -y install centos-release-ceph
1515

16+
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel python2-devel"
17+
18+
BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel librgw-devel"
19+
1620
# basic packages to install
17-
xargs yum -y install <<< "
18-
git
19-
bison
20-
cmake
21-
dbus-devel
22-
flex
23-
gcc-c++
24-
git
25-
krb5-devel
26-
libacl-devel
27-
libblkid-devel
28-
libcap-devel
29-
libnfsidmap-devel
30-
libwbclient-devel
31-
redhat-rpm-config
32-
rpm-build
33-
libcephfs-devel
34-
librgw-devel
35-
xfsprogs-devel
36-
python2-devel
37-
userspace-rcu-devel
38-
"
21+
case "${CENTOS_VERSION}" in
22+
7)
23+
yum install -y ${BUILDREQUIRES} ${BUILDREQUIRES_EXTRA}
24+
;;
25+
8s)
26+
yum install -y ${BUILDREQUIRES}
27+
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
28+
;;
29+
*)
30+
ENABLE_REPOS="--enablerepo=powertools"
31+
BUILDREQUIRES="${BUILDREQUIRES} python3-devel rpcgen libtirpc-devel liburing-devel rsync "
32+
yum -y update --skip-broken --nobest
33+
yum -y install epel-release
34+
;;
35+
esac
3936

4037
git clone --depth=1 ${GIT_REPO}
4138
cd $(basename "${GERRIT_PROJECT}")

‎jobs/scripts/code_compilation/basic-gluster-duffy.sh ‎build_scripts/code-compilation/basic-gluster-duffy.sh

File renamed without changes.

‎jobs/code_compilation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- job:
2-
name: nfs_ganesha_code_compilation
2+
name: code-compilation
33
node: cico-workspace
44
description: 'Run code compilation for nfs-ganesha against the latest build of Ganesha with FSAL_GLUSTER.'
55
project-type: freestyle

‎jobs/nfs-ganesha_trigger-fsal_template.yml ‎jobs/fsal_template.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
- project:
2-
name: 'nfs-ganesha_trigger-fsal'
2+
name: 'fsal'
33
product:
44
- cephfs
55
- gluster
66
- rgw
77

88
jobs:
9-
- '{name}_{product}'
9+
- '{name}-{product}'
1010

1111
- job-template:
12-
name: '{name}_{product}'
12+
name: '{name}-{product}'
1313
node: cico-workspace
1414
project-type: freestyle
1515
concurrent: false
@@ -31,6 +31,11 @@
3131
- centos_variables
3232

3333
builders:
34+
35+
- shell: !include-raw-escape: scripts/fsal-build.sh
36+
37+
builders:
38+
- shell: !include-raw-escape: scripts/common/get-node.sh
3439
- shell: !include-raw-escape: scripts/fsal-build.sh
3540

3641
triggers:

‎jobs/scripts/common.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export BUILD_NUMBER=${BUILD_NUMBER}
99
if [ "$JOB_NAME" == "nfs_ganesha_dbench" ]; then
1010
bash $WORKSPACE/ci-tests/jobs/scripts/dbench/basic-gluster-duffy.sh
1111
RET=$?
12-
elif [ "$JOB_NAME" == "nfs_ganesha_code_compilation" ]; then
13-
bash $WORKSPACE/ci-tests/jobs/scripts/code_compilation/basic-gluster-duffy.sh
12+
elif [ "$JOB_NAME" == "code-compilation" ]; then
13+
bash $WORKSPACE/ci-tests/build_scripts/code-compilation/basic-gluster-duffy.sh
1414
RET=$?
1515
fi
1616

‎jobs/scripts/common/get-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ do
2222
fi
2323
done
2424

25-
if [ "$JOB_NAME" == "nfs-ganesha_trigger-fsal_cephfs" ] || [ "$JOB_NAME" == "nfs-ganesha_trigger-fsal_gluster" ] || [ "$JOB_NAME" == "nfs-ganesha_trigger-fsal_rgw" ]; then
25+
if [[ $JOB_NAME =~ fsal-* ]]; then
2626
node_count=1
2727
else
2828
node_count=2

‎jobs/scripts/fsal-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set +x
55
set +e
66

77
# run the bootstrap script
8-
python $WORKSPACE/ci-tests/build_scripts/common/bootstrap.py
8+
bash $WORKSPACE/ci-tests/build_scripts/build-fsal/bootstrap.sh
99
RET=$?
1010

1111
# we accept different return values

0 commit comments

Comments
 (0)