From 3680f687b2c1dc4ad71e3f8c245ebde4b0765756 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdh8d@virginia.edu>
Date: Fri, 9 Nov 2018 11:10:19 -0800
Subject: [PATCH] updated to try to set build results as a gitlab -artifact-
---
.gitlab-ci.yml | 4 ++++
cicd_tests/do-build.sh | 40 +++++++++++++++++++++++++---------------
2 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 076514a..b48a546 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,10 @@ after_script:
stage: build
script:
- ./cicd_tests/do-build.sh
+ artifacts:
+ paths:
+ - "./ps-install-*"
+
# per os items
do-build-ubuntu18:
diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh
index 1d0f58c..860b35a 100755
--- a/cicd_tests/do-build.sh
+++ b/cicd_tests/do-build.sh
@@ -3,23 +3,33 @@
set -e
set -x
-# gather info for debugging later, probably not necessary
-pwd
-hostname
-whoami
-env|grep CICD
+main()
+{
-# puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR
-cicd_setup_module_dependency allnp/peasoup_umbrella.git
+ # gather info for debugging later, probably not necessary
+ pwd
+ hostname
+ whoami
+ env|grep CICD
+ local orig_dir=$(pwd)
-# puts the version of zipr to test in peasoup_umbrella/zipr.
-cicd_put_module_in_tree peasoup_umbrella/zipr
+ # puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR
+ cicd_setup_module_dependency allnp/peasoup_umbrella.git
-# Build/run $PSZ, test result
-cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
-source set_env_vars
-sudo ./get-peasoup-packages.sh all
-./build-all.sh
-dropdb $PGDATABASE 2>/dev/null || true ; ./postgres_setup.sh
+ # puts the version of zipr to test in peasoup_umbrella/zipr.
+ cicd_put_module_in_tree peasoup_umbrella/zipr
+
+ # Build/run $PSZ, test result
+ cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+ source set_env_vars
+ sudo ./get-peasoup-packages.sh all
+ ./build-all.sh
+ dropdb $PGDATABASE 2>/dev/null || true ; ./postgres_setup.sh
+
+ cd $orig_dir
+ cp $CICD_MODULE_WORK_DIR/install ps-install-$OS
+}
+
+main "$@"
--
GitLab