libcouchbase: fix openssl11 in packaging

Author: avsej

libcouchbase/Jenkinsfile.erb

@@ -259,6 +259,9 @@ def package_deb(name, arch, codename, VERSION) {
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
     dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
+        if (!(relno == 7 && name == 'centos')) {
+            sh("sed -i 's/openssl11-devel/openssl-devel/g' ../libcouchbase/packaging/rpm/libcouchbase.spec.in")
+        }
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
             < ../libcouchbase/packaging/rpm/libcouchbase.spec.in > libcouchbase.spec
@@ -280,9 +283,6 @@ def package_rpm(name, bits, relno, arch, mock, VERSION) {
         sh("rm -rf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.log")
         sh("tar cf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}")
         archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar", fingerprint: true)
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.src.rpm", name: '${name}7-srpm')
-        }
     }
 }
 <% end %>

libcouchbase/lcb-lnx-scripted-build-pipeline.groovy

@@ -190,6 +190,9 @@ def package_deb(name, arch, codename, VERSION) {
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
     dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
+        if (!(relno == 7 && name == 'centos')) {
+            sh("sed -i 's/openssl11-devel/openssl-devel/g' ../libcouchbase/packaging/rpm/libcouchbase.spec.in")
+        }
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
             < ../libcouchbase/packaging/rpm/libcouchbase.spec.in > libcouchbase.spec
@@ -211,9 +214,6 @@ def package_rpm(name, bits, relno, arch, mock, VERSION) {
         sh("rm -rf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.log")
         sh("tar cf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}")
         archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar", fingerprint: true)
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.src.rpm", name: '${name}7-srpm')
-        }
     }
 }
 

libcouchbase/lcb-scripted-build-pipeline.groovy

@@ -190,6 +190,9 @@ def package_deb(name, arch, codename, VERSION) {
 def package_srpm(name, bits, relno, arch, mock, VERSION) {
     dir("ws_${name}${relno}-${bits}/build") {
         unstash 'tarball'
+        if (!(relno == 7 && name == 'centos')) {
+            sh("sed -i 's/openssl11-devel/openssl-devel/g' ../libcouchbase/packaging/rpm/libcouchbase.spec.in")
+        }
         sh("""
             sed 's/@VERSION@/${VERSION.rpmVer()}/g;s/@RELEASE@/${VERSION.rpmRel()}/g;s/@TARREDAS@/${VERSION.tarName()}/g' \
             < ../libcouchbase/packaging/rpm/libcouchbase.spec.in > libcouchbase.spec
@@ -211,9 +214,6 @@ def package_rpm(name, bits, relno, arch, mock, VERSION) {
         sh("rm -rf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.log")
         sh("tar cf libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}")
         archiveArtifacts(artifacts: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}.tar", fingerprint: true)
-        if (name == 'centos' && relno == 7 && arch == 'x86_64') {
-            stash(includes: "libcouchbase-${VERSION.tar()}_${name}${relno}_${arch}/*.src.rpm", name: '${name}7-srpm')
-        }
     }
 }