feat: fix CI

NetApp · Sep 24, 2024 · 9130478 · 9130478
1 parent 0e8107d
commit 9130478
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
@@ -87,6 +87,13 @@ pipeline {
                                          zip -r native_logs.zip /var/log/harvest
                                          '''
                                      archiveArtifacts artifacts: "native_logs.zip", fingerprint: true
+
+                                     withCredentials([string(credentialsId: 'PROMETHEUS_URL', variable: 'PROMETHEUS_URL')]) {
+                                         sh '''
+                                         cd /opt/harvest
+                                         bin/harvest generate metrics --poller dc1 --config /u/mpeg/harvest/harvest.yml --prom-url $PROMETHEUS_URL
+                                         '''
+                                         }
                                 }
                             }
                         }

diff --git a/jenkins/artifacts/jenkinsfile b/jenkins/artifacts/jenkinsfile
@@ -191,16 +191,7 @@ pipeline {
         stage('Test and Generate Harvest Metrics') {
             steps {
                 script {
-                    def promUrlParam = ""
-                    if (params.RUN_TEST == 'true') {
-                        withCredentials([string(credentialsId: 'PROMETHEUS_URL', variable: 'PROMETHEUS_URL')]) {
-                            promUrlParam = "--prom-url $PROMETHEUS_URL"
-                        }
-                    }
-                    def result = sh(script: """
-                        export VERSION=$VERSION
-                        bin/harvest generate metrics --poller dc1 --config /u/mpeg/harvest/harvest.yml ${promUrlParam}
-                    """, returnStatus: true)
+                    def result = sh(script: 'bin/harvest generate metrics --poller dc1 --config /u/mpeg/harvest/harvest.yml', returnStatus: true)
                     if (result != 0) {
                         error("Generate Harvest metrics command failed.")
                     }