From 6866fafd32f6643804195bf0d4d3b8b34b35d234 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdh8d@virginia.edu>
Date: Tue, 6 Nov 2018 16:36:11 -0800
Subject: [PATCH] changed to use test_cmd.sh to run rida and rida-p1 tests
---
.gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78c41d9c0..fec6af5b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,13 +5,12 @@ before_script:
after_script:
- "source ~gitlab-runner/cicd_support/cicd_support.shinc"
- - "cicd_cleanup"
-xform-ls:
+build:
+ stage: build
tags:
- psz
- - integration
- script:
+ script:
- "# gather info for debugging later, probably not necessary "
- "pwd"
- "hostname"
@@ -23,9 +22,41 @@ xform-ls:
- "sudo ./get-peasoup-packages.sh all"
- "./build-all.sh --debug"
- "./postgres_setup.sh"
+
+xform-ls:
+ stage: test
+ tags:
+ - psz
+ - integration
+ script:
+ - "cd $CICD_TO_TEST_DIR"
+ - "source set_env_vars"
- "cd /tmp"
- "rm -rf ped_ls; $PSZ /bin/ls ./xxx -c rida=on -s meds_static=off --tempdir ped_ls || true"
- "if [[ ! -x ./xxx ]]; then cat ped_ls/logs/*; fi"
- "rm -rf ped_ls"
- "./xxx"
+
+basic_pgms_rida:
+ stage: test
+ tags:
+ - psz
+ - integration
+ script:
+ - "cd $CICD_TO_TEST_DIR/peasoup_examples/tests"
+ - "source set_env_vars"
+ - "cd /tmp"
+ - "cd $PEASOUP_HOME/tests; ./test_cmds.sh rida"
+
+basic_pgms_rida_p1:
+ stage: test
+ tags:
+ - psz
+ - integration
+ script:
+ - "cd $CICD_TO_TEST_DIR/peasoup_examples/tests"
+ - "source set_env_vars"
+ - "cd /tmp"
+ - "cd $PEASOUP_HOME/tests; ./test_cmds.sh rida_p1"
+
--
GitLab