From 5dd66a807344a806f04eef0b935509026cbd0406 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdh8d@virginia.edu>
Date: Sat, 10 Nov 2018 14:21:51 -0800
Subject: [PATCH] change to do ubuntu 16 testing, and nightly cleaning
---
.gitlab-ci.yml | 89 ++++++++++++++++++++++++++++++++++++----
cicd_testing/do-clean.sh | 20 +++++++++
2 files changed, 101 insertions(+), 8 deletions(-)
create mode 100755 cicd_testing/do-clean.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50e0924d5..1bd696742 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,32 +4,105 @@ before_script:
after_script:
- "source ~gitlab-runner/cicd_support/cicd_support.shinc"
-do-build:
- stage: build
+stages:
+ - clean
+ - build
+ - test
+
+
+#
+# Cleaning
+#
+.do-nightly-clean: &do-nightly-clean
+ stage: clean
+ script:
+ - ./cicd_testing/do-clean.sh
+
+do-nightly-clean-ubuntu18:
+ <<: *do-nightly-clean
tags:
- ubuntu18
+
+do-nightly-clean-ubuntu16:
+ <<: *do-nightly-clean
+ tags:
+ - ubuntu16
+
+#
+# Building
+#
+
+.do-build: &do-build
+ stage: build
script:
- ./cicd_testing/do-build.sh
-xform-ls:
- stage: test
+do-build-ubuntu18:
+ <<: *do-build
tags:
- ubuntu18
+
+do-build-ubuntu16:
+ <<: *do-build
+ tags:
+ - ubuntu16
+
+#
+# $PSZ ls
+#
+
+.xform-ls: &xform-ls
+ stage: test
script:
- ./cicd_testing/xform-ls.sh
-basic-pgms-rida:
- stage: test
+xform-ls-ubuntu18:
+ <<: *xform-ls
tags:
- ubuntu18
+
+xform-ls-ubuntu16:
+ <<: *xform-ls
+ tags:
+ - ubuntu16
+
+
+
+#
+# test_cmds.sh rida
+#
+.basic-pgms-rida: &basic-pgms-rida
+ stage: test
script:
- ./cicd_testing/basic-pgms-rida.sh
-basic-pgms-rida-p1:
- stage: test
+basic-pgms-rida-ubuntu18:
+ <<: *basic-pgms-rida
tags:
- ubuntu18
+
+basic-pgms-rida-ubuntu16:
+ <<: *basic-pgms-rida
+ tags:
+ - ubuntu16
+
+#
+# test_cmds.sh rida-p1
+#
+.basic-pgms-rida-p1: &basic-pgms-rida-p1
+ stage: test
script:
- ./cicd_testing/basic-pgms-rida-p1.sh
+basic-pgms-rida-p1-ubuntu18:
+ <<: *basic-pgms-rida-p1
+ tags:
+ - ubuntu18
+
+basic-pgms-rida-p1-ubuntu16:
+ <<: *basic-pgms-rida-p1
+ tags:
+ - ubuntu16
+
+
diff --git a/cicd_testing/do-clean.sh b/cicd_testing/do-clean.sh
new file mode 100755
index 000000000..9f9d4fd50
--- /dev/null
+++ b/cicd_testing/do-clean.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+set -x
+
+main()
+{
+
+ if [[ $CICD_NIGHTLY == 1 ]] ; then
+ # gather info for debugging later, probably not necessary
+ pwd
+ hostname
+ whoami
+ env|grep CICD
+
+ rm -rf /tmp/peasoup_test
+ fi
+}
+
+main "$@"
+
--
GitLab