From cafa3a934d3ff065893e6a77a6defaae019cbe34 Mon Sep 17 00:00:00 2001
From: Stephen Lane-Walsh <slwalsh@psfc.mit.edu>
Date: Tue, 6 Feb 2024 13:24:22 -0500
Subject: [PATCH] Build: Sign packages with Jenkins, upload Windows installers
 to GitHub

Rename `tarfiles/` folder to `packages/`
---
 Jenkinsfile                                   |  8 ++++++--
 deploy/packaging/windows/create_installer.sh  |  5 +++++
 deploy/platform/debian/debian_docker_build.sh | 10 +++++-----
 deploy/platform/redhat/redhat_docker_build.sh | 10 +++++-----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e45c598ba3..e7bcfa71e7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -194,13 +194,17 @@ pipeline {
                                     stage("${OS} Release") {
                                         sh "./deploy/build.sh --os=${OS} --release=${new_version}"
                                         
-                                        findFiles(glob: "tarfiles/*.tgz").each {
+                                        findFiles(glob: "packages/*.tgz").each {
+                                            file -> release_file_list.add(WORKSPACE + "/" + file.path)
+                                        }
+
+                                        findFiles(glob: "packages/*.exe").each {
                                             file -> release_file_list.add(WORKSPACE + "/" + file.path)
                                         }
                                     }
 
                                     stage("${OS} Publish") {
-                                        sh "./deploy/build.sh --os=${OS} --publish=${new_version} --publishdir=/tmp/publish"
+                                        sh "./deploy/build.sh --os=${OS} --publish=${new_version} --keys=/mdsplus/certs --publishdir=/tmp/publish"
                                     }
                                 }
                             }
diff --git a/deploy/packaging/windows/create_installer.sh b/deploy/packaging/windows/create_installer.sh
index f76c40ed1a..7e2d3f7e96 100755
--- a/deploy/packaging/windows/create_installer.sh
+++ b/deploy/packaging/windows/create_installer.sh
@@ -30,3 +30,8 @@ if [ -d /sign_keys ]; then
     echo "Failed to sign installer"
   fi
 fi
+
+PACKAGESDIR=/workspace/packages
+rm -Rf ${PACKAGESDIR}
+mkdir -p $PACKAGESDIR
+cp /release/${FLAVOR}/*.exe $PACKAGESDIR/
\ No newline at end of file
diff --git a/deploy/platform/debian/debian_docker_build.sh b/deploy/platform/debian/debian_docker_build.sh
index 477db4ff92..b08de99282 100755
--- a/deploy/platform/debian/debian_docker_build.sh
+++ b/deploy/platform/debian/debian_docker_build.sh
@@ -65,11 +65,11 @@ buildrelease() {
   # ${RELEASEDIR}/${FLAVOR}/DEBS will be cleaned in debian_build.sh
   RELEASEDEBS=/release/${FLAVOR}/DEBS/${ARCH}
   RELEASEBLD=/workspace/releasebld
-  TARFILES=/workspace/tarfiles
+  PACKAGESDIR=/workspace/packages
   BUILDROOT=${RELEASEBLD}/buildroot
   MDSPLUS_DIR=${BUILDROOT}/usr/local/mdsplus
-  rm -Rf ${RELEASEBLD}/${bits} ${BUILDROOT} ${TARFILES}
-  mkdir -p ${RELEASEBLD}/${bits} ${BUILDROOT} ${MDSPLUS_DIR} ${TARFILES}
+  rm -Rf ${RELEASEBLD}/${bits} ${BUILDROOT} ${PACKAGESDIR}
+  mkdir -p ${RELEASEBLD}/${bits} ${BUILDROOT} ${MDSPLUS_DIR} ${PACKAGESDIR}
   pushd ${RELEASEBLD}/${bits}
   config ${config_param} ${CONFIGURE_EXTRA}
   if [ -z "$NOMAKE" ]; then
@@ -155,11 +155,11 @@ EOF
       popd
 
       pushd ${MDSPLUS_DIR}
-      tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
+      tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
       popd
 
       pushd ${RELEASEDEBS}
-      tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_debs.tgz *.deb
+      tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_debs.tgz *.deb
       popd
     fi #abort
   fi   #nomake
diff --git a/deploy/platform/redhat/redhat_docker_build.sh b/deploy/platform/redhat/redhat_docker_build.sh
index df8d462887..b460872409 100755
--- a/deploy/platform/redhat/redhat_docker_build.sh
+++ b/deploy/platform/redhat/redhat_docker_build.sh
@@ -57,10 +57,10 @@ buildrelease() {
   set -e
   RELEASEBLD=/workspace/releasebld
   BUILDROOT=${RELEASEBLD}/buildroot
-  TARFILES=/workspace/tarfiles
+  PACKAGESDIR=/workspace/packages
   MDSPLUS_DIR=${BUILDROOT}/usr/local/mdsplus
-  rm -Rf ${RELEASEBLD} /release/${FLAVOR} ${TARFILES}
-  mkdir -p ${RELEASEBLD}/64 ${BUILDROOT} ${MDSPLUS_DIR} ${TARFILES}
+  rm -Rf ${RELEASEBLD} /release/${FLAVOR} ${PACKAGESDIR}
+  mkdir -p ${RELEASEBLD}/64 ${BUILDROOT} ${MDSPLUS_DIR} ${PACKAGESDIR}
   pushd ${RELEASEBLD}/64
   config ${test64} ${CONFIGURE_EXTRA}
   if [ -z "$NOMAKE" ]; then
@@ -135,11 +135,11 @@ EOF
     checkstatus abort "Failure: Problem with contents of one or more rpms. (see above)" $badrpm
 
     pushd ${MDSPLUS_DIR}
-    tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
+    tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}.tgz *
     popd
 
     pushd /release/${FLAVOR}/RPMS
-    tar -czf $TARFILES/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_rpms.tgz */*.rpm
+    tar -czf $PACKAGESDIR/mdsplus_${FLAVOR}_${RELEASE_VERSION}_${OS}_${ARCH}_rpms.tgz */*.rpm
     popd
   fi #nomake
 }