18874: Add workbench2 to package-building scripts.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/build/get-package-version.sh b/build/get-package-version.sh
index e4579cbb3f14dcd85d5b6c1749b87c5914bcb22e..5147f7bba6adc9bbd0795ad76f6b6e16a8fcb130 100755 (executable)
--- a/build/get-package-version.sh
+++ b/build/get-package-version.sh
@@ -33,7 +33,7 @@ if [[ "$WORKSPACE" == "" ]]; then
 fi
 
 
-debug_echo "package_go_binary $SRC_PATH"
+debug_echo "get-package-version.sh $TYPE_LANG $SRC_PATH"
 
 if [[ "$TYPE_LANG" == "go" ]]; then
   calculate_go_package_version go_package_version $SRC_PATH

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 01434d924b07048684a0419655b5e96f44a1ca16..4d6b34c163dfe7eb410ebd32984788a6993c26b0 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -304,6 +304,9 @@ build_metapackage "arvados-user-activity" "tools/user-activity"
 # The cwltest package, which lives out of tree
 handle_cwltest "$FORMAT" "$ARCH"
 
+# Workbench2
+package_workbench2
+
 # Rails packages
 debug_echo -e "\nRails packages\n"
 

diff --git a/build/run-library.sh b/build/run-library.sh
index 67176ad59f1fdb315053b9ea503efdabba3e44f9..973fceed63ef085d12eb0c7acbc39c9923c58fd0 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -115,6 +115,24 @@ handle_ruby_gem() {
     fi
 }
 
+# Usage: package_workbench2
+package_workbench2() {
+    local pkgname=arvados-workbench2
+    local src=services/workbench2
+    local dst=/var/www/arvados-workbench2/workbench2
+    local description="Arvados Workbench 2"
+    local version="$(version_from_git)"
+    cd "$WORKSPACE/$src"
+    rm -rf ./build
+    VERSION="$VERSION" BUILD_NUMBER="$(default_iteration "$pkgname" "$version" yarn)" GIT_COMMIT="$(git rev-parse HEAD | head -c9)" yarn build
+    cd "$WORKSPACE/packages/$TARGET"
+    fpm_build "${WORKSPACE}/$src" "${WORKSPACE}/$src/build/=$dst" "$pkgname" dir "$version" \
+              --license="GNU Affero General Public License, version 3.0" \
+              --description="${description}" \
+              --config-files="/etc/arvados/$pkgname/workbench2.example.json" \
+              "$WORKSPACE/services/workbench2/etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$pkgname/workbench2.example.json"
+}
+
 calculate_go_package_version() {
   # $__returnvar has the nameref attribute set, which means it is a reference
   # to another variable that is passed in as the first argument to this function.
@@ -1066,7 +1084,7 @@ EOF
 }
 
 # Build packages for everything
-fpm_build () {
+fpm_build() {
   # Source dir where fpm-info.sh (if any) will be found.
   SRC_DIR=$1
   shift