This is an automated email from the ASF dual-hosted git repository.
rantunes pushed a commit to branch kie-issues_755
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-operator.git
The following commit(s) were added to refs/heads/kie-issues_755 by this push:
new 3120fdb1 Add workaround for Lock plugin, remove directory deletion
before git checkout and add default container engine
3120fdb1 is described below
commit 3120fdb16e62397beab83836fd1f3d44fce08847
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Dec 12 15:20:25 2023 -0300
Add workaround for Lock plugin, remove directory deletion before git
checkout and add default container engine
---
.ci/jenkins/Jenkinsfile.deploy | 5 +----
.ci/jenkins/scripts/helper.groovy | 8 +++++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index c4514642..b2aa7caf 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -15,6 +15,7 @@ pipeline {
options {
timeout(time: 24, unit: 'HOURS') // Give the day to be executed (due
to the lock)
+ disableConcurrentBuilds() // Workaround for missing lock plugin
installed on ASF Jenkins
}
environment {
@@ -189,10 +190,6 @@ pipeline {
return helper.shouldLaunchTests()
}
}
- options {
- // Lock on OCP API as we want only one run at a time
- lock("BDD tests on OCP API ${getLockOpenshiftApi()}")
- }
stages {
stage('Run full testing') {
options {
diff --git a/.ci/jenkins/scripts/helper.groovy
b/.ci/jenkins/scripts/helper.groovy
index 1e06d7db..afade057 100644
--- a/.ci/jenkins/scripts/helper.groovy
+++ b/.ci/jenkins/scripts/helper.groovy
@@ -33,7 +33,7 @@ void initPipeline() {
openshift.openshiftApiCredsKey = env.OPENSHIFT_CREDS_KEY
container = load '.ci/jenkins/scripts/container.groovy'
- container.containerEngine = env.CONTAINER_ENGINE
+ container.containerEngine = env.CONTAINER_ENGINE ?: 'docker'
container.containerTlsOptions = env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''
container.containerOpenshift = openshift
}
@@ -64,14 +64,16 @@ String getTempTag() {
void checkoutRepo(String repoName = '', String directory = '') {
repoName = repoName ?: getRepoName()
closure = {
- deleteDir()
checkout(githubscm.resolveRepository(repoName, getGitAuthor(),
getBuildBranch(), false, getGitAuthorCredsId()))
// need to manually checkout branch since on a detached branch after
checkout command
sh "git checkout ${getBuildBranch()}"
}
if (directory) {
- dir(directory, closure)
+ dir(directory) {
+ deleteDir()
+ closure()
+ }
} else {
closure()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
