kso-issue-376: Fix loading of script & unused variable

apache · Feb 5, 2024 · 2023587 · 2023587
1 parent 22a7115
commit 2023587
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.e2e.cluster b/.ci/jenkins/Jenkinsfile.e2e.cluster
@@ -18,7 +18,7 @@ pipeline {
     options {
         timeout(time: 3, unit: 'HOURS')
         timestamps()
-    }
+    }p/kind-logs/
 
     stages {
         stage('Setup pipeline') {
@@ -110,7 +110,7 @@ pipeline {
                                 make test-e2e
                             """
                         } catch (err) {
-                            kind.exportLogs("/tmp/kind-logs")
+                            kind.exportLogs(kindLogsFolder)
                             sh 'make undeploy'
                             throw err
                         }
@@ -123,7 +123,7 @@ pipeline {
     post {
         always {
             script {
-                archiveArtifacts(artifacts: "**/tmp/kind-logs/")
+                archiveArtifacts(artifacts: "**${kindLogsFolder}")
             }
         }
         cleanup {

diff --git a/.ci/jenkins/scripts/helper.groovy b/.ci/jenkins/scripts/helper.groovy
@@ -1,7 +1,7 @@
 openshift = null
 container = null
 properties = null
-minikube = null
+kind = null
 
 defaultImageParamsPrefix = 'IMAGE'
 baseImageParamsPrefix = 'BASE_IMAGE'
@@ -19,7 +19,7 @@ void initPipeline() {
     container.containerEngineTlsOptions = env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''
     container.containerOpenshift = openshift
 
-    minikube = load '.ci/jenkins/scripts/minikube.groovy'
+    kind = load '.ci/jenkins/scripts/kind.groovy'
 }
 
 void updateDisplayName() {