changed to support better testing across multi-os

.gitlab-ci.yml

@@ -9,34 +9,14 @@ do-build:
   tags:
     - ubuntu18
   script:
-    - "# update submodules" 
-    - "git submodule sync --recursive"
-    - "git submodule update --recursive --init"
-    - "# gather info for debugging later, probably not necessary "
-    - "pwd"
-    - "hostname"
-    - "whoami"
-    - "env|grep CICD"
-    - ""
-    - "time rsync -a --exclude='.git'  $CICD_TO_TEST_DIR/ /tmp/peasoup_test"
-    - "cd /tmp/peasoup_test"
-    - "source set_env_vars"
-    - "sudo ./get-peasoup-packages.sh all"
-    - "./build-all.sh --debug"
-    - "./postgres_setup.sh"
+    - ./cicd_testing/do-build.sh 
 
 xform-ls:
   stage: test
   tags:
     - ubuntu18
   script:
-    - "cd /tmp/peasoup_test"
-    - "source set_env_vars"
-    - "cd /tmp"
-    - "rm -rf xxx 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"
+    - ./cicd_testing/xform-ls.sh
 
 
 basic-pgms-rida:
@@ -44,18 +24,12 @@ basic-pgms-rida:
   tags:
     - ubuntu18
   script:
-    - "cd /tmp/peasoup_test"
-    - "source set_env_vars"
-    - "cd $CICD_TO_TEST_DIR/peasoup_examples/tests"
-    - "cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida"
+    - ./cicd_testing/basic-pgms-rida.sh
 
 basic-pgms-rida-p1:
   stage: test
   tags:
     - ubuntu18
   script:
-    - "cd /tmp/peasoup_test"
-    - "source set_env_vars"
-    - "cd $CICD_TO_TEST_DIR/peasoup_examples/tests"
-    - "cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida_p1"
+    - ./cicd_testing/basic-pgms-rida-p1.sh
 

cicd_testing/basic-pgms-rida-p1.sh

+#/bin/bash 
+set -e
+
+cd /tmp/peasoup_test
+source set_env_vars
+cd $CICD_TO_TEST_DIR/peasoup_examples/tests
+cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida_p1
+

cicd_testing/basic-pgms-rida.sh

+#!/bin/bash
+set -e
+
+cd /tmp/peasoup_test
+source set_env_vars
+cd $CICD_TO_TEST_DIR/peasoup_examples/tests
+cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh rida
+

cicd_testing/do-build.sh

+#!/bin/bash
+set -e
+
+
+update submodules
+git submodule sync --recursive
+git submodule update --recursive --init
+gather info for debugging later, probably not necessary 
+pwd
+hostname
+whoami
+env|grep CICD
+
+time rsync -a --exclude='.git'  $CICD_TO_TEST_DIR/ /tmp/peasoup_test
+cd /tmp/peasoup_test
+source set_env_vars
+sudo ./get-peasoup-packages.sh all
+build-all.sh --debug
+postgres_setup.sh
+

cicd_testing/xform-ls.sh

+#!/bin/bash
+set -e
+
+cd /tmp/peasoup_test
+source set_env_vars
+cd /tmp
+rm -rf xxx 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
+