diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a49b86d2db1ac25964567997abd79cf15426e1af..3e35614494b04facd2b15ff1bfc5073f46d17c4d 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 72fccdfe306599f83a1492e3896c792d0050aa5e..86a4aa66be65e8a28cbedd0a8a7f9e62860afd24 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 39fb06747e74a12a002b58dc868a3665de5cda58..12f53f6a9b9cea8542e15170cbec760e6269a5e3 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