Merge pull request #105 from Manimaran-MM/mani-vfs-fix

[Job Fix]: Run FSAL_VFS tests instead of FSAL_GLUSTER

Author: kalebskeithley

build_scripts/build-fsal/build-fsal_vfs.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+set -ex
+
+# these variables need to be set
+[ -n "${GERRIT_HOST}" ]
+[ -n "${GERRIT_PROJECT}" ]
+[ -n "${GERRIT_REFSPEC}" ]
+
+# only use https for now
+GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
+
+# enable the Storage SIG Gluster and Ceph repositories
+dnf -y install centos-release-gluster yum-utils centos-release-ceph epel-release
+
+BUILDREQUIRES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libblkid-devel libcap-devel libgfapi-devel xfsprogs-devel"
+BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel"
+
+# basic packages to install
+case "${CENTOS_VERSION}" in
+    9s)
+        dnf install -y ${BUILDREQUIRES}
+        dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
+    ;;
+esac
+
+git init $(basename "${GERRIT_PROJECT}")
+cd $(basename "${GERRIT_PROJECT}")
+git remote add origin ${GIT_REPO}
+git fetch --depth=1 origin ${GERRIT_REFSPEC}
+git checkout FETCH_HEAD
+
+# update libntirpc
+git submodule update --recursive --init || git submodule sync --recursive
+
+# cleanup old build dir
+[ -d build ] && rm -rf build
+
+mkdir build
+cd build
+
+( cmake ../src -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_VFS=ON -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=OFF -DUSE_FSAL_RGW=OFF -DUSE_FSAL_GPFS=OFF -DUSE_MONITORING=ON && make) || touch FAILED
+
+# we accept different return values
+# 0 - SUCCESS
+# 1 - FAILED
+
+if [ -e FAILED ]; then
+    exit 1
+else
+    exit 0
+fi

jobs/scripts/trigger-fsal-on-new-patch.groovy

@@ -0,0 +1,61 @@
+pipeline {{
+    agent {{ label 'cico-workspace' }}
+
+    stages {{
+        stage('Trigger FSAL Jobs in Parallel') {{
+            steps {{
+                script {{
+                    def gerritParams = [
+                        'GERRIT_PATCHSET_REVISION', 'GERRIT_REFSPEC', 'GERRIT_PROJECT', 'GERRIT_HOST'
+                    ]
+
+                    def sharedParams = gerritParams.collect {{ paramName ->
+                        string(name: paramName, value: env.getProperty(paramName) ?: '')
+                    }}
+
+                    def jobList = ['fsal-cephfs', 'fsal-vfs', 'fsal-gpfs', 'fsal-rgw']
+                    def results = [:]
+                    def messages = ["**FSAL Job Results:**\\n"]
+
+                    parallel jobList.collectEntries {{ job ->
+                        [(job): {{
+                            def build = build job: job, parameters: sharedParams, propagate: false, wait: true
+                            results[job] = build
+
+                            def msg = ''
+                            try {{
+                                def jobUrl = build.absoluteUrl
+                                def artifactUrl = "${{jobUrl}}artifact/result_message.txt"
+                                sh "curl -s -o tmp_result_message_${{job}}.txt '${{artifactUrl}}'"
+                                msg = readFile("tmp_result_message_${{job}}.txt").trim()
+                            }} catch (Exception e) {{
+                                msg = "**🔴 ${{job}}: ERROR fetching result_message.txt**"
+                            }}
+
+                            messages << msg
+                        }}]
+                    }}
+
+                    def finalMessage = messages.join("\\n")
+                    writeFile file: 'gerrit_message.txt', text: finalMessage
+
+                    def notifyFlag = '--notify NONE'
+                    if (finalMessage.contains('FAILED')) {{
+                        notifyFlag = '--notify ALL'
+                    }}
+
+                    withCredentials([file(credentialsId: 'GERRITHUB_PRIVATE_KEY', variable: 'GERRITHUB_KEY_FILE')]) {{
+                        sh """
+                            ssh -i $GERRITHUB_KEY_FILE -l jenkins-glusterorg -o StrictHostKeyChecking=no -p 29418 $GERRIT_HOST \\
+                                gerrit review \\
+                                $notifyFlag \\
+                                --message "'$(cat gerrit_message.txt)'" \\
+                                --project $GERRIT_PROJECT \\
+                                $GERRIT_PATCHSET_REVISION
+                        """
+                    }}
+                }}
+            }}
+        }}
+    }}
+}}

jobs/trigger-fsal-on-new-patch.yml

@@ -1,8 +1,8 @@
-- pipeline:
+- job:
     name: trigger-fsal-on-new-patch
     node: cico-workspace
     description: >-
-      Run fsal-cephfs, fsal-gluster, fsal-gpfs, fsal-rgw on nfs-ganesha. This job is triggered by
+      Run fsal-cephfs, fsal-vfs, fsal-gpfs, fsal-rgw on nfs-ganesha. This job is triggered by
       sending a change to
       https://review.gerrithub.io/#/q/project:ffilz/nfs-ganesha for review.
 
@@ -38,65 +38,4 @@
               branches:
                 - branch-pattern: "**"
                   branch-compare-type: ANT
-    dsl: |
-      pipeline {
-        agent { label 'cico-workspace' }
-
-        stages {
-          stage('Trigger FSAL Jobs in Parallel') {
-            steps {
-              script {
-                def gerritParams = [
-                  'GERRIT_PATCHSET_REVISION', 'GERRIT_REFSPEC', 'GERRIT_PROJECT','GERRIT_HOST'
-                ]
-
-                def sharedParams = gerritParams.collect { paramName ->
-                  string(name: paramName, value: env.getProperty(paramName) ?: '')
-                }
-
-                def jobList = ['fsal-cephfs', 'fsal-gluster', 'fsal-gpfs', 'fsal-rgw']
-                def results = [:]
-                def messages = ["**FSAL Job Results:**\\n"]
-
-                parallel jobList.collectEntries { job ->
-                  [(job): {
-                    def build = build job: job, parameters: sharedParams, propagate: false, wait: true
-                    results[job] = build
-
-                    def msg = ''
-                    try {
-                      def jobUrl = build.absoluteUrl
-                      def artifactUrl = "\${jobUrl}artifact/result_message.txt"
-                      sh "curl -s -o tmp_result_message_\${job}.txt '\${artifactUrl}'"
-                      msg = readFile("tmp_result_message_\${job}.txt").trim()
-                    } catch (Exception e) {
-                      msg = "**🔴 \${job}: ERROR fetching result_message.txt**"
-                    }
-
-                    messages << msg
-                  }]
-                }
-
-                def finalMessage = messages.join("\\n")
-                writeFile file: 'gerrit_message.txt', text: finalMessage
-
-                def notifyFlag = '--notify NONE' // default
-                if (finalMessage.contains('FAILED')) {
-                  notifyFlag = '--notify ALL'
-                }
-                
-                withCredentials([file(credentialsId: 'GERRITHUB_PRIVATE_KEY', variable: 'GERRITHUB_KEY_FILE')]) {
-                  sh """
-                    ssh -i \$GERRITHUB_KEY_FILE -l jenkins-glusterorg -o StrictHostKeyChecking=no -p 29418 \$GERRIT_HOST \\
-                      gerrit review \\
-                      $notifyFlag \\
-                      --message "'$(cat gerrit_message.txt)'" \\
-                      --project $GERRIT_PROJECT \\
-                      $GERRIT_PATCHSET_REVISION
-                  '''
-                }
-              }
-            }
-          }
-        }
-      }
+    dsl: !include-raw: scripts/trigger-fsal-on-new-patch.groovy