Meridio: periodic job improvements

* Refactor code generated stage
* Helm chart generator + Upload to artifactory
* Security scanner and e2e job call

Change-Id: Ia0341ebcdf009c0e1594d09b282d33b0f9406146

diff --git a/jjb/nsm/Jenkinsfile b/jjb/nsm/Jenkinsfile
index e30b92eb6188a32b645e4df0d787262a08983a0b..914dbbb6f53da4cc8c14a315a401ce8db4f0bf64 100644 (file)
--- a/jjb/nsm/Jenkinsfile
+++ b/jjb/nsm/Jenkinsfile
@@ -34,6 +34,8 @@ node('nordix-nsm-build-ubuntu2204') {
         def image_names = params.IMAGE_NAMES.split(' ')
         def version = params.IMAGE_VERSION
         def e2e_enabled = params.E2E_ENABLED
+        def helm_chart_upload = params.HELM_CHART_UPLOAD
+        def security_scan_enabled = params.SECURITY_SCAN_ENABLED
         def git_project = params.GIT_PROJECT
         def current_branch = params.CURRENT_BRANCH
         def default_branch = params.DEFAULT_BRANCH
@@ -55,12 +57,7 @@ node('nordix-nsm-build-ubuntu2204') {
                 ])
                 sh 'git show'
             }
-            stage('Verify') {
-                Verify().call()
-                if (currentBuild.result == 'FAILURE') {
-                    Error('Failed at verification stage').call()
-                }
-            }
+            Verify().call()
             stage('Docker login') {
                 if (env.DRY_RUN != 'true') {
                     withCredentials([usernamePassword(credentialsId: 'nordix-cicd-harbor-credentials', passwordVariable: 'HARBOR_PASSWORD', usernameVariable: 'HARBOR_USERNAME')]) {
@@ -69,7 +66,7 @@ node('nordix-nsm-build-ubuntu2204') {
                     '''
                     }
                 } else {
-                    Utils.markStageSkippedForConditional('Docker login')
+                    echo 'Docker login'
                 }
             }
             stage('Base Image') {
@@ -81,9 +78,19 @@ node('nordix-nsm-build-ubuntu2204') {
                     Error('Failed to build image(s)').call()
                 }
             }
+            stage('Helm Chart') {
+                HelmChart(helm_chart_upload, version).call()
+            }
+            stage('Security Scan') {
+                if (security_scan_enabled == true) {
+                    SecurityScan(current_branch, version).call()
+                } else {
+                    Utils.markStageSkippedForConditional('Security Scan')
+                }
+            }
             stage('E2E') {
-                if (e2e_enabled == 'true' && env.DRY_RUN != 'true') {
-                    E2e(e2e_enabled).call()
+                if (e2e_enabled == true) {
+                    E2e(current_branch, version).call()
                 } else {
                     Utils.markStageSkippedForConditional('E2E')
                 }
@@ -95,17 +102,12 @@ node('nordix-nsm-build-ubuntu2204') {
     }
 }
 
-// Static analysis: Runs the GeneratedCode function and then UnitTests and Linter in parallel
+// Verify the Generated code, UnitTests and Linter
 def Verify() {
     return {
         GeneratedCode().call() // cannot generate code and run the linter and tests at the same time
-        // Linter().call()
-        // UnitTests().call()
-        def stages = [:]
-        stages.put('Unit Tests', UnitTests())
-        stages.put('Linter', Linter())
-        // stages.put('Generated code verification', GeneratedCode())
-        parallel(stages)
+        Linter().call()
+        UnitTests().call()
     }
 }
 
@@ -121,8 +123,7 @@ def UnitTests() {
                 SetBuildStatus(completed, context, success)
             } catch (Exception e) {
                 SetBuildStatus(failed, context, failure)
-                unstable "${exception_message_exec} ${command}"
-                currentBuild.result = 'FAILURE'
+                Error("${exception_message_exec} ${command}").call()
             }
         }
     }
@@ -140,8 +141,7 @@ def Linter() {
                 SetBuildStatus(completed, context, success)
             } catch (Exception e) {
                 SetBuildStatus(failed, context, failure)
-                unstable "${exception_message_exec} ${command}"
-                currentBuild.result = 'FAILURE'
+                Error("${exception_message_exec} ${command}").call()
             }
         }
     }
@@ -155,36 +155,20 @@ def Linter() {
 def GeneratedCode() {
     return {
         def context = 'Generated code verification'
-        SetBuildStatus(in_progress, context, pending)
-        stage('go mod tidy') {
-            def command = 'go mod tidy'
-            try {
-                ExecSh(command).call()
-                if (GetModifiedFiles() != '') {
-                    throw new Exception(exception_message_code_generation)
-                }
-            } catch (Exception e) {
-                SetBuildStatus(failed, context, failure)
-                Error(exception_message_exec + command).call()
-            }
-        }
-        stage('go generate ./...') {
-            def command = 'make generate'
+        stage('Generated code verification') {
+            def command = 'make go-generate manifests generate-controller'
             try {
+                SetBuildStatus(in_progress, context, pending)
                 ExecSh(command).call()
                 if (GetModifiedFiles() != '') {
                     throw new Exception(exception_message_code_generation)
                 }
+                SetBuildStatus(completed, context, success)
             } catch (Exception e) {
                 SetBuildStatus(failed, context, failure)
                 Error(exception_message_exec + command).call()
             }
         }
-        stage('Proto') {
-            // TODO: protoc version could be different
-            Utils.markStageSkippedForConditional('Proto')
-        }
-        SetBuildStatus(completed, context, success)
     }
 }
 
@@ -227,11 +211,64 @@ def Build(image, version, build_steps, registry, local_version) {
     }
 }
 
+// Generate and upload the helm chart
+def HelmChart(helm_chart_upload, version) {
+    return {
+        parallel(
+            'Helm Chart': {
+                stage('Generate Helm Chart') {
+                    def context = 'Generate Helm Chart'
+                    def command = "make generate-helm-chart VERSION=${version}"
+                    try {
+                        SetBuildStatus(in_progress, context, pending)
+                        ExecSh(command).call()
+                        SetBuildStatus(completed, context, success)
+                    } catch (Exception e) {
+                        SetBuildStatus(failed, context, failure)
+                        Error("${exception_message_exec} ${command}").call()
+                    }
+                }
+                stage('Upload Helm Chart') {
+                    if (helm_chart_upload == true) {
+                        withCredentials([string(credentialsId: 'nsm-nordix-artifactory-api-key', variable: 'API_KEY')]) {
+                            ExecSh("""
+                                charts=\$(cd _output/helm/ && ls *.tgz)
+                                for chart in \$charts
+                                do
+                                    curl -H 'X-JFrog-Art-Api:${API_KEY}' -T _output/helm/\$chart \"https://artifactory.nordix.org/artifactory/cloud-native/meridio/\$chart\"
+                                done
+                            """).call()
+                        }
+                    } else {
+                        Utils.markStageSkippedForConditional('Upload Helm Chart')
+                    }
+                }
+            }
+        )
+    }
+}
+
+// Run the security scan job
+def SecurityScan(current_branch, version) {
+    return {
+        build job: 'meridio-periodic-security-scan', parameters: [
+            string(name: 'IMAGE_VERSION', value: "$version"),
+            string(name: 'CURRENT_BRANCH', value: "$current_branch"),
+            string(name: 'DRY_RUN', value: env.DRY_RUN)
+        ], wait: true
+    }
+}
+
 // Run the E2e Tests
 // Currently skipped
-def E2e(e2e_enabled) {
+def E2e(current_branch, version) {
     return {
-        echo 'make e2e' // todo
+        build job: 'meridio-e2e-test-kind', parameters: [
+            string(name: 'MERIDIO_VERSION', value: "$version"),
+            string(name: 'TAPA_VERSION', value: "$version"),
+            string(name: 'CURRENT_BRANCH', value: "$current_branch"),
+            string(name: 'DRY_RUN', value: env.DRY_RUN)
+        ], wait: true
     }
 }
 

diff --git a/jjb/nsm/meridio-e2e-long-run-test-kind.yaml b/jjb/nsm/meridio-e2e-long-run-test-kind.yaml
index 678878a2071b0c315fc2dab671259b91a1538104..218463ae7c3a5bf06fb10bc4d8fdd0aa467bf3b4 100644 (file)
--- a/jjb/nsm/meridio-e2e-long-run-test-kind.yaml
+++ b/jjb/nsm/meridio-e2e-long-run-test-kind.yaml
@@ -98,7 +98,7 @@
       - string:
           name: INTERVAL
           default: "7200"
-          description: Interval between each e2e test run (in seconds)
+          description: Interval between each e2e test run (in seconds). This also defines the timeout of the e2e test runs.
       - bool:
           name: DRY_RUN
           default: false

diff --git a/jjb/nsm/meridio-periodic.yaml b/jjb/nsm/meridio-periodic.yaml
index 4acefe37f62541280af3e1585ccf02359f98296f..d4e1f25512d65aa72c0e343c9d5a007f0b3aed28 100644 (file)
--- a/jjb/nsm/meridio-periodic.yaml
+++ b/jjb/nsm/meridio-periodic.yaml
@@ -59,10 +59,18 @@
           name: IMAGE_VERSION
           default: 'latest'
           description: Version of the images
-      - string:
+      - bool:
           name: E2E_ENABLED
-          default: "false"
-          description: Is E2E Tests enabled?
+          default: false
+          description: Run the e2e tests?
+      - bool:
+          name: HELM_CHART_UPLOAD
+          default: true
+          description: Upload Helm Charts?
+      - bool:
+          name: SECURITY_SCAN_ENABLED
+          default: false
+          description: Run the security scan?
       - string:
           name: GIT_PROJECT
           default: "https://github.com/Nordix/Meridio.git"

diff --git a/jjb/nsm/meridio-pull-request.yaml b/jjb/nsm/meridio-pull-request.yaml
index 9dd3301cfb937cdd6c27992909dc8c78ec771f25..c32235956a86fe9c1c7f9654a2d155c671712d06 100644 (file)
--- a/jjb/nsm/meridio-pull-request.yaml
+++ b/jjb/nsm/meridio-pull-request.yaml
@@ -60,10 +60,18 @@
           name: IMAGE_VERSION
           default: 'latest'
           description: Version of the images
-      - string:
+      - bool:
           name: E2E_ENABLED
-          default: "false"
-          description: Is E2E Tests enabled?
+          default: false
+          description: Run the e2e tests?
+      - bool:
+          name: HELM_CHART_UPLOAD
+          default: false
+          description: Upload Helm Charts?
+      - bool:
+          name: SECURITY_SCAN_ENABLED
+          default: false
+          description: Run the security scan?
       - string:
           name: GIT_PROJECT
           default: "https://github.com/Nordix/Meridio.git"