.gitlab-ci.yml

@@ -5,39 +5,140 @@ before_script:
 after_script:
   - "echo Test Complete."
 
+stages:
+  - clean
+  - build
+  - test
 
 
-do-build-ubuntu18:
-  stage: build
+
+#
+# Cleaning
+#
+
+#template 
+.do-clean: &do-nightly-clean
+  stage: clean
+  script:
+    - ./cicd_tests/do-clean.sh
+
+# per os items
+do-nightly-clean-ubuntu18:
+  <<: *do-nightly-clean
   tags:
     - ubuntu18
-  script:
-    - ./cicd_tests/do-build.sh
+  variables:
+    OS: 'ubuntu18'  
 
-do-build-ubuntu16:
-  stage: build
+# per os items
+do-nightly-clean-ubuntu16:
+  <<: *do-nightly-clean
   tags:
     - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+
+#
+# building 
+#
+
+
+# template
+.do-build: &do-build
+  stage: build
   script:
     - ./cicd_tests/do-build.sh
 
-xform-ls:
-  stage: test
+
+# per os items
+do-build-ubuntu18:
+  <<: *do-build
   tags:
     - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+
+do-build-ubuntu16:
+  <<: *do-build
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+
+
+#
+# $PSZ ls
+#
+
+# template
+.xform-ls: &xform-ls
+  stage: test
   script:
     - ./cicd_tests/xform-ls.sh
 
-xform-cat:
-  stage: test
+#per OS
+xform-ls-ubuntu18:
+  <<: *xform-ls
   tags:
     - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+xform-ls-ubuntu16:
+  <<: *xform-ls
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+#
+# $PSZ cat
+#
+
+# template
+.xform-cat: &xform-cat
+  stage: test
   script:
     - ./cicd_tests/xform-cat.sh
 
-internal-tests:
-  stage: test
+xform-cat-ubuntu18:
+  <<: *xform-cat
   tags:
     - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+    
+xform-cat-ubuntu16:
+  <<: *xform-cat
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+#
+# run zipr internal tests
+#
+
+# template
+.internal-tests: &internal-tests
+  stage: test
   script:
     - ./cicd_tests/internal-tests.sh
+
+#per OS
+internal-tests-ubuntu18:
+  <<: *internal-tests
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+internal-tests-ubuntu16:
+  <<: *internal-tests
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  

cicd_tests/do-build.sh

@@ -3,23 +3,32 @@
 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
+}
+
+main "$@"

cicd_tests/do-clean.sh

+#/bin/bash 
+
+set -e
+set -x
+
+main()
+{
+
+	# gather info for debugging later, probably not necessary 
+	pwd
+	hostname
+	whoami
+	env|grep "^CICD"
+
+
+	if [[ $CICD_NIGHTLY == 1 ]] ; then
+		rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella
+	fi
+
+}
+
+main "$@"