.gitlab-ci.yml

 before_script:
   - "source ~gitlab-runner/cicd_support/cicd_support.shinc" 
 
+
 after_script:
-  - "source ~gitlab-runner/cicd_support/cicd_support.shinc" 
-  - "cicd_cleanup"
+  - "echo Test Complete, eliding cleanup"
+  - "rm -rf /tmp/ped_ls /tmp/ls.rida /tmp/ped_cat"
 
-xform-ls:
+
+
+do_build:
+  stage: build
   tags:
     - zipr
-    - integration
   script:
     - "# gather info for debugging later, probably not necessary "
     - "pwd"
@@ -26,15 +29,58 @@ xform-ls:
     - "cd $CICD_MODULE_WORK_DIR/peasoup_umbrella"
     - "source set_env_vars"
     - "sudo ./get-peasoup-packages.sh all"
-    - "./build-all.sh --debug"
-    - "./postgres_setup.sh"
+    - "./build-all.sh"
+    - "dropdb $PGDATABASE 2>/dev/null || true ; ./postgres_setup.sh"
+
+xform-ls:
+  stage: test
+  tags:
+    - zipr
+  script:
+    - "cd $CICD_MODULE_WORK_DIR/peasoup_umbrella"
+    - "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; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true"
+    - "if [[ ! -x ./ls.rida ]]; then cat ped_ls/logs/*; fi"
     - "rm -rf ped_ls"
-    - "./xxx"
+    - "./ls.rida"
     - ""
+
+xform-cat:
+  stage: test
+  tags:
+    - zipr
+  script:
+    - "cd $CICD_MODULE_WORK_DIR/peasoup_umbrella"
+    - "source set_env_vars"
+    - "cd /tmp"
+    - "rm -rf ped_cat; $PSZ /bin/ls ./cat.rida -c rida=on -s meds_static=off --tempdir ped_cat || true"
+    - "if [[ ! -x ./cat.rida ]]; then cat ped_ls/logs/*; fi"
+    - "./cat.rida /dev/null "
+    - ""
+
+internal-tests:
+  stage: test
+  tags:
+    - zipr
+  script:
+    - "cd $CICD_MODULE_WORK_DIR/peasoup_umbrella"
+    - "source set_env_vars"
     - "# run zipr internal tests"
     - "cd $ZIPR_HOME/test; scons"
     - "for i in *.exe; do ./$i; done"
 
+
+update-ps:
+   stage: deploy
+   only: 
+      refs:
+        - master
+   when: on_success
+   tags:
+      - zipr
+   script:
+      - "cd $CICD_MODULE_WORK_DIR/peasoup_umbrella"
+      - "git commit -m \"submod automatic update from zipr update-ps job on $(date)\" zipr"
+      - "git push"
+