Code Indentation

Cisco-Talos · Dec 21, 2023 · 220e918 · 220e918
1 parent c2a3efc
commit 220e918
Showing 1 changed file with 86 additions and 72 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -48,118 +48,132 @@ properties(
 )
 
 
- pipeline {
-    agent {label "ubuntu-18-x64"}
+pipeline {
+
+    agent {
+        label "ubuntu-18-x64"
+    }
+
     stages {
-        stage('Gitgaurdian') {
+
+        stage('GitGaurdian Scan') {
             environment {
                 GITGUARDIAN_API_KEY = credentials('gitgaudian-ravi-token')
             }
-            agent {label "docker"}
+            agent { label "docker" }
             steps {
                 withDockerContainer(args: "-i --entrypoint=''", image: 'gitguardian/ggshield:latest') {
                     sh 'ggshield secret scan ci'
                 }
             }
         }
 
-
         stage('Generate Tarball') {
-            cleanWs()
+            steps {
 
-            checkout scm
+                cleanWs()
 
-            dir(path: 'clamav_documentation') {
-                git(url: 'https://github.com/Cisco-Talos/clamav-documentation.git', branch: "gh-pages")
-            }
+                checkout scm
+
+                dir(path: 'clamav_documentation') {
+                    git(url: 'https://github.com/Cisco-Talos/clamav-documentation.git', branch: "gh-pages")
+                }
 
-            dir(path: 'docs/html') {
-                sh '''# Move the clamav-documentation here.
+                dir(path: 'docs/html') {
+                    sh """# Move the clamav-documentation here.
                     cp -r ../../clamav_documentation/* .
                     # Clean-up
                     rm -rf ../../clamav_documentation
                     rm -rf .git .nojekyll CNAME Placeholder || true
-                    '''
-            }
+                    """
+                }
 
-            dir(path: 'build') {
-                sh """# CPack
+                dir(path: 'build') {
+                    sh """# CPack
                     cmake .. -D VENDOR_DEPENDENCIES=ON
                     cpack --config CPackSourceConfig.cmake """
-                archiveArtifacts(artifacts: "clamav-${params.VERSION}*.tar.gz", onlyIfSuccessful: true)
-            }
+                    archiveArtifacts(artifacts: "clamav-${params.VERSION}*.tar.gz", onlyIfSuccessful: true)
+                }
 
-            cleanWs()
+                cleanWs()
+            }
         }
 
-
         stage('Build') {
-            buildResult = build(job: "test-pipelines/${params.BUILD_PIPELINE}",
-                propagate: true,
-                wait: true,
-                parameters: [
-                    [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
-                    [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
-                    [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
-                    [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
-                    [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
-                ]
-            )
-            echo "test-pipelines/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
+            steps {
+                buildResult = build(job: "test-pipelines/${params.BUILD_PIPELINE}",
+                        propagate: true,
+                        wait: true,
+                        parameters: [
+                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
+                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
+                                [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
+                                [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
+                                [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
+                        ]
+                )
+                echo "test-pipelines/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
+            }
         }
 
         stage('Tests') {
             parallel {
                 stages {
                     stage("Regular Pipeline") {
-                        regularResult = build(job: "test-pipelines/${params.REGULAR_PIPELINE}",
-                            propagate: true,
-                            wait: true,
-                            parameters: [
-                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
-                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
-                                [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_PIPELINE}"],
-                                [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
-                                [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_BRANCH}"],
-                                [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
-                                [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
-                                [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
-                            ]
-                        )
-                        echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
+                        steps {
+                            regularResult = build(job: "test-pipelines/${params.REGULAR_PIPELINE}",
+                                    propagate: true,
+                                    wait: true,
+                                    parameters: [
+                                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
+                                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
+                                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_PIPELINE}"],
+                                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
+                                            [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_BRANCH}"],
+                                            [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
+                                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
+                                            [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
+                                    ]
+                            )
+                            echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
+                        }
                     }
 
                     stage("Custom Pipeline") {
-                        final customResult = build(job: "test-pipelines/${params.CUSTOM_PIPELINE}",
-                            propagate: true,
-                            wait: true,
-                            parameters: [
-                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
-                                [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
-                                [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_CUSTOM_BRANCH}"],
-                                [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
-                                [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
-                                [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
-                            ]
-                        )
-                        echo "test-pipelines/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
+                        steps {
+                            customResult = build(job: "test-pipelines/${params.CUSTOM_PIPELINE}",
+                                    propagate: true,
+                                    wait: true,
+                                    parameters: [
+                                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
+                                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
+                                            [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_CUSTOM_BRANCH}"],
+                                            [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
+                                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
+                                            [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
+                                    ]
+                            )
+                            echo "test-pipelines/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
+                        }
                     }
 
                 }
                 // Running Regular and custom tests in sequential order
                 stage("Fuzz Regression") {
-                    final fuzzResult = build(job: "test-pipelines/${params.FUZZ_PIPELINE}",
-                        propagate: true,
-                        wait: true,
-                        parameters: [
-                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
-                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
-                            [$class: 'StringParameterValue', name: 'TESTS_FUZZ_BRANCH', value: "${params.TESTS_FUZZ_BRANCH}"],
-                            [$class: 'StringParameterValue', name: 'FUZZ_CORPUS_BRANCH', value: "${params.FUZZ_CORPUS_BRANCH}"],
-                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
-                        ]
-                    )
-                    echo "test-pipelines/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
+                    steps {
+                        fuzzResult = build(job: "test-pipelines/${params.FUZZ_PIPELINE}",
+                                propagate: true,
+                                wait: true,
+                                parameters: [
+                                        [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
+                                        [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
+                                        [$class: 'StringParameterValue', name: 'TESTS_FUZZ_BRANCH', value: "${params.TESTS_FUZZ_BRANCH}"],
+                                        [$class: 'StringParameterValue', name: 'FUZZ_CORPUS_BRANCH', value: "${params.FUZZ_CORPUS_BRANCH}"],
+                                        [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
+                                ]
+                        )
+                        echo "test-pipelines/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
+                    }
                 }
             }
         }