libcouchbase: always stash SRPMs

avsej · avsej · commit 2f8407ec0d7c · 2023-06-14T20:17:42.000+03:00
diff --git a/libcouchbase/Jenkinsfile.erb b/libcouchbase/Jenkinsfile.erb
@@ -276,9 +276,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
             sudo mock --buildsrpm -r ${mock} --spec libcouchbase.spec --sources ${pwd()} --old-chroot \
             --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_srpm"
         """.stripIndent())
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
-        }
+        stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
     }
 }
 
diff --git a/libcouchbase/lcb-lnx-scripted-build-pipeline.groovy b/libcouchbase/lcb-lnx-scripted-build-pipeline.groovy
@@ -203,9 +203,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
             sudo mock --buildsrpm -r ${mock} --spec libcouchbase.spec --sources ${pwd()} --old-chroot \
             --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_srpm"
         """.stripIndent())
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
-        }
+        stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
     }
 }
 
diff --git a/libcouchbase/lcb-scripted-build-pipeline.groovy b/libcouchbase/lcb-scripted-build-pipeline.groovy
@@ -203,9 +203,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {
             sudo mock --buildsrpm -r ${mock} --spec libcouchbase.spec --sources ${pwd()} --old-chroot \
             --resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_srpm"
         """.stripIndent())
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
-        }
+        stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -276,9 +276,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {`
`276`	`276`	`sudo mock --buildsrpm -r ${mock} --spec libcouchbase.spec --sources ${pwd()} --old-chroot \`
`277`	`277`	`--resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_srpm"`
`278`	`278`	`""".stripIndent())`
`279`		`- if (name == 'centos' && relno == 7 && arch == 'x86_64') {`
`280`		`- stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")`
`281`		`- }`
	`279`	`+ stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")`
`282`	`280`	`}`
`283`	`281`	`}`
`284`	`282`
Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,7 @@ def package_srpm(name, bits, relno, arch, mock, VERSION) {`
`203`	`203`	`sudo mock --buildsrpm -r ${mock} --spec libcouchbase.spec --sources ${pwd()} --old-chroot \`
`204`	`204`	`--resultdir="libcouchbase-${VERSION.tar()}_${name}${relno}_srpm"`
`205`	`205`	`""".stripIndent())`
`206`		`- if (name == 'centos' && relno == 7 && arch == 'x86_64') {`
`207`		`- stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")`
`208`		`- }`
	`206`	`+ stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_srpm/*.src.rpm", name: "${name}${relno}-srpm")`
`209`	`207`	`}`
`210`	`208`	`}`
`211`	`209`