Skip to content

Commit

Permalink
kso-issue-376: Fix loading of script & unused variable
Browse files Browse the repository at this point in the history
  • Loading branch information
domhanak committed Feb 5, 2024
1 parent 22a7115 commit 2023587
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .ci/jenkins/Jenkinsfile.e2e.cluster
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pipeline {
options {
timeout(time: 3, unit: 'HOURS')
timestamps()
}
}p/kind-logs/

stages {
stage('Setup pipeline') {
Expand Down Expand Up @@ -110,7 +110,7 @@ pipeline {
make test-e2e
"""
} catch (err) {
kind.exportLogs("/tmp/kind-logs")
kind.exportLogs(kindLogsFolder)
sh 'make undeploy'
throw err
}
Expand All @@ -123,7 +123,7 @@ pipeline {
post {
always {
script {
archiveArtifacts(artifacts: "**/tmp/kind-logs/")
archiveArtifacts(artifacts: "**${kindLogsFolder}")
}
}
cleanup {
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/scripts/helper.groovy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openshift = null
container = null
properties = null
minikube = null
kind = null

defaultImageParamsPrefix = 'IMAGE'
baseImageParamsPrefix = 'BASE_IMAGE'
Expand All @@ -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() {
Expand Down

0 comments on commit 2023587

Please sign in to comment.