From e56814c9a9b776a9ecb337a28c4962b312400bda Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Thu, 16 Feb 2023 10:47:04 -0800
Subject: [PATCH] Fix network script bug
---
.gitlab-ci.yml | 2 ++
channels/run.sh | 5 +----
gen/run.sh | 5 -----
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a49b86d..3e35614 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,6 +108,7 @@ channels:
script:
- mkdir -p ~/.elixxir
- echo $PWD
+ - cp network/network.sh channels/network.sh
- cd channels
- rm -fr results
- rm -fr results-cpu
@@ -123,6 +124,7 @@ channels:
- sed -i 's/useGPU\:\ false/useGPU\:\ true/g' server-[12345].yaml
- NSYSENABLED=TRUE ./run.sh
- mv results results-gpu
+ - rm network.sh
- cd ..
artifacts:
when: always
diff --git a/channels/run.sh b/channels/run.sh
index 72fccdf..86a4aa6 100755
--- a/channels/run.sh
+++ b/channels/run.sh
@@ -1,5 +1,3 @@
-cp ../network/network.sh temp_network.sh
-
# NOTE: This is verbose on purpose.
################################################################################
@@ -71,7 +69,7 @@ echo "NETWORK: $NETWORKENTRYPOINT"
if [ "$NETWORKENTRYPOINT" == "localhost:1060" ]
then
- source temp_network.sh
+ source network.sh
else
echo "Connecting to network defined at $NETWORKENTRYPOINT"
@@ -231,4 +229,3 @@ then
#diff -aruN client121BackupDiff.txt noerrors.txt
fi
-rm temp_network.sh
\ No newline at end of file
diff --git a/gen/run.sh b/gen/run.sh
index 39fb067..12f53f6 100755
--- a/gen/run.sh
+++ b/gen/run.sh
@@ -1,6 +1,3 @@
-cp ../network/network.sh temp_network.sh
-
-
# NOTE: This is verbose on purpose.
################################################################################
## Initial Set Up & Clean Up of Past Runs
@@ -175,5 +172,3 @@ then
#echo "NOTE: BACKUP CHECK DISABLED, this should be uncommented when turned back on!"
#diff -aruN client121BackupDiff.txt noerrors.txt
fi
-
-rm temp_network.sh
\ No newline at end of file
--
GitLab