libcouchbase: try to workaround cleanWs issue

couchbaselabs · Oct 7, 2022 · d31c69b · d31c69b
1 parent 83d01cc
commit d31c69b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/libcouchbase/Jenkinsfile.erb b/libcouchbase/Jenkinsfile.erb
@@ -236,11 +236,15 @@ pipeline {
         booleanParam(name: "USE_TLS", defaultValue: false)
         booleanParam(name: "USE_CERT_AUTH", defaultValue: false)
     }
+    post {
+        always {
+            cleanWs(cleanWhenNotBuilt: false, deleteDirs: true, disableDeferredWipeout: true)
+        }
+    }
     stages {
         stage('prepare and validate') {
             agent { label 'centos7 || centos6' }
             steps {
-                cleanWs()
                 script {
                     if (IS_GERRIT_TRIGGER.toBoolean()) {
                         currentBuild.displayName = "cv-${BUILD_NUMBER}"
@@ -555,7 +559,7 @@ pipeline {
                     stages {
                         stage('<%= name[0] %><%= bits %>v<%= relno %>') {
                             steps {
-                                dir('ws_<%= name %><%= bits %>_v<%= relno %>') {
+                                dir('ws_<%= name %><%= relno %>-<%= bits %>') {
                                     sh("sudo chown couchbase:couchbase -R .")
                                     deleteDir()
                                     unstash 'libcouchbase'
@@ -713,7 +717,7 @@ def package_deb(name, arch, codename, VERSION) {
 }
 
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
@@ -727,7 +731,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
 }
 
 def package_rpm(bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         sh("""
             sudo mock --rebuild -r ${mock} --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}" --old-chroot \
             --verbose libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/libcouchbase-${VERSION.version()}-${VERSION.rpmRel()}.el${relno}.src.rpm

diff --git a/libcouchbase/lcb-lnx-scripted-build-pipeline.groovy b/libcouchbase/lcb-lnx-scripted-build-pipeline.groovy
@@ -168,11 +168,15 @@ pipeline {
         booleanParam(name: "USE_TLS", defaultValue: false)
         booleanParam(name: "USE_CERT_AUTH", defaultValue: false)
     }
+    post {
+        always {
+            cleanWs(cleanWhenNotBuilt: false, deleteDirs: true, disableDeferredWipeout: true)
+        }
+    }
     stages {
         stage('prepare and validate') {
             agent { label 'centos7 || centos6' }
             steps {
-                cleanWs()
                 script {
                     if (IS_GERRIT_TRIGGER.toBoolean()) {
                         currentBuild.displayName = "cv-${BUILD_NUMBER}"
@@ -355,7 +359,7 @@ pipeline {
                     stages {
                         stage('c64v7') {
                             steps {
-                                dir('ws_centos64_v7') {
+                                dir('ws_centos7-64') {
                                     sh("sudo chown couchbase:couchbase -R .")
                                     deleteDir()
                                     unstash 'libcouchbase'
@@ -379,7 +383,7 @@ pipeline {
                     stages {
                         stage('r64v8') {
                             steps {
-                                dir('ws_rhel64_v8') {
+                                dir('ws_rhel8-64') {
                                     sh("sudo chown couchbase:couchbase -R .")
                                     deleteDir()
                                     unstash 'libcouchbase'
@@ -752,7 +756,7 @@ def package_deb(name, arch, codename, VERSION) {
 }
 
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
@@ -766,7 +770,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
 }
 
 def package_rpm(bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         sh("""
             sudo mock --rebuild -r ${mock} --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}" --old-chroot \
             --verbose libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/libcouchbase-${VERSION.version()}-${VERSION.rpmRel()}.el${relno}.src.rpm

diff --git a/libcouchbase/lcb-scripted-build-pipeline.groovy b/libcouchbase/lcb-scripted-build-pipeline.groovy
@@ -168,11 +168,15 @@ pipeline {
         booleanParam(name: "USE_TLS", defaultValue: false)
         booleanParam(name: "USE_CERT_AUTH", defaultValue: false)
     }
+    post {
+        always {
+            cleanWs(cleanWhenNotBuilt: false, deleteDirs: true, disableDeferredWipeout: true)
+        }
+    }
     stages {
         stage('prepare and validate') {
             agent { label 'centos7 || centos6' }
             steps {
-                cleanWs()
                 script {
                     if (IS_GERRIT_TRIGGER.toBoolean()) {
                         currentBuild.displayName = "cv-${BUILD_NUMBER}"
@@ -448,7 +452,7 @@ pipeline {
                     stages {
                         stage('c64v7') {
                             steps {
-                                dir('ws_centos64_v7') {
+                                dir('ws_centos7-64') {
                                     sh("sudo chown couchbase:couchbase -R .")
                                     deleteDir()
                                     unstash 'libcouchbase'
@@ -606,7 +610,7 @@ def package_deb(name, arch, codename, VERSION) {
 }
 
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
@@ -620,7 +624,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
 }
 
 def package_rpm(bits, relno, arch, mock, VERSION) {
-    dir("ws_${name}${bits}_v${relno}/build") {
+    dir("ws_${name}${relno}-${bits}/build") {
         sh("""
             sudo mock --rebuild -r ${mock} --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}" --old-chroot \
             --verbose libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/libcouchbase-${VERSION.version()}-${VERSION.rpmRel()}.el${relno}.src.rpm

diff --git a/libcouchbase/lcb-win-scripted-build-pipeline.groovy b/libcouchbase/lcb-win-scripted-build-pipeline.groovy
@@ -168,11 +168,15 @@ pipeline {
         booleanParam(name: "USE_TLS", defaultValue: false)
         booleanParam(name: "USE_CERT_AUTH", defaultValue: false)
     }
+    post {
+        always {
+            cleanWs(cleanWhenNotBuilt: false, deleteDirs: true, disableDeferredWipeout: true)
+        }
+    }
     stages {
         stage('prepare and validate') {
             agent { label 'centos7 || centos6' }
             steps {
-                cleanWs()
                 script {
                     if (IS_GERRIT_TRIGGER.toBoolean()) {
                         currentBuild.displayName = "cv-${BUILD_NUMBER}"