From 202358743dd8aa2da1e2243a528b0a693db17188 Mon Sep 17 00:00:00 2001 From: Dominik Hanak Date: Mon, 5 Feb 2024 17:13:17 +0100 Subject: [PATCH] kso-issue-376: Fix loading of script & unused variable --- .ci/jenkins/Jenkinsfile.e2e.cluster | 6 +++--- .ci/jenkins/scripts/helper.groovy | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.e2e.cluster b/.ci/jenkins/Jenkinsfile.e2e.cluster index 33edf7531..49476a3fc 100644 --- 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 index 38542b708..85326e70e 100644 --- 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() {