From 2719f29880e8c12d00352f2972300103d6ea0340 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdh8d@virginia.edu>
Date: Sat, 16 Feb 2019 19:52:58 -0500
Subject: [PATCH] renamed workdir to avoid conflicts with other tests

---
 cicd_tests/do-build.sh       | 6 +++---
 cicd_tests/do-clean.sh       | 2 +-
 cicd_tests/internal-tests.sh | 2 +-
 cicd_tests/xform-cat.sh      | 2 +-
 cicd_tests/xform-ls.sh       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh
index 2ea87c466..049042865 100755
--- a/cicd_tests/do-build.sh
+++ b/cicd_tests/do-build.sh
@@ -15,14 +15,14 @@ main()
 	local orig_dir=$(pwd)
 
 	# puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR
-	cicd_setup_module_dependency allnp/peasoup_umbrella.git
+	cicd_setup_module_dependency allnp/peasoup_umbrella.git zipr_umbrella
 
 
 	# puts the version of zipr to test in peasoup_umbrella/zipr.
-	cicd_put_module_in_tree peasoup_umbrella/zipr
+	cicd_put_module_in_tree zipr_umbrella/zipr
 
 	# Build/run $PSZ, test result
-	cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+	cd $CICD_MODULE_WORK_DIR/zipr_umbrella
 	source set_env_vars
 	sudo ./get-peasoup-packages.sh all
 	./build-all.sh
diff --git a/cicd_tests/do-clean.sh b/cicd_tests/do-clean.sh
index 95dc3b04b..f6b44214b 100755
--- a/cicd_tests/do-clean.sh
+++ b/cicd_tests/do-clean.sh
@@ -14,7 +14,7 @@ main()
 
 
 	if [[ $CICD_NIGHTLY == 1 ]] ; then
-		rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella
+		rm -rf $CICD_MODULE_WORK_DIR/zipr_umbrella
 	fi
 
 }
diff --git a/cicd_tests/internal-tests.sh b/cicd_tests/internal-tests.sh
index 7d4c8ee05..b8995514f 100755
--- a/cicd_tests/internal-tests.sh
+++ b/cicd_tests/internal-tests.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+cd $CICD_MODULE_WORK_DIR/zipr_umbrella
 source set_env_vars
 # run zipr internal tests
 cd $ZIPR_HOME/test; scons
diff --git a/cicd_tests/xform-cat.sh b/cicd_tests/xform-cat.sh
index af86bf8e4..9e976892d 100755
--- a/cicd_tests/xform-cat.sh
+++ b/cicd_tests/xform-cat.sh
@@ -1,4 +1,4 @@
-cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+cd $CICD_MODULE_WORK_DIR/zipr_umbrella
 
 set -e
 set -x
diff --git a/cicd_tests/xform-ls.sh b/cicd_tests/xform-ls.sh
index 8a37160ea..9b94ebf39 100755
--- a/cicd_tests/xform-ls.sh
+++ b/cicd_tests/xform-ls.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+cd $CICD_MODULE_WORK_DIR/zipr_umbrella
 source set_env_vars
 cd /tmp
 rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true
-- 
GitLab