Browse Source

Add additional shasum conditions, add artifact dir

Anuj Bansal 3 years ago
parent
commit
70d77a8fa0
2 changed files with 11 additions and 4 deletions
  1. 3 0
      .gitignore
  2. 8 4
      scripts/runtime-code-shasum.sh

+ 3 - 0
.gitignore

@@ -40,6 +40,9 @@ yarn*
 test-data/
 tmp.*
 
+# env variables saved as artifacts for builds
+runtime-inputs/
+
 .my_setup
 
 devops/infrastructure

+ 8 - 4
scripts/runtime-code-shasum.sh

@@ -15,12 +15,17 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 
 export TEST_NODE_BLOCKTIME=1000
-export TEST_PROPOSALS_PARAMETERS_PATH="./tests/integration-tests/proposal-parameters.json"
 
-if [[ -z "$ALL_PROPOSALS_PARAMETERS_JSON" ]]; then
+if [[ -n "$ALL_PROPOSALS_PARAMETERS_JSON" ]] && [[ -n "$TEST_NODE" ]]; then
+  echo "Do not set both TEST_NODE and ALL_PROPOSALS_PARAMETERS_JSON env variables"
+  exit 1
+elif [[ -z "$ALL_PROPOSALS_PARAMETERS_JSON" ]] && [[ -z "$TEST_NODE" ]]; then
   PROPOSALS_PARAMETERS_FILE=""
+elif [[ -n "$TEST_NODE" ]]; then
+  PROPOSALS_PARAMETERS_FILE="./tests/integration-tests/proposal-parameters.json"
 else
-  PROPOSALS_PARAMETERS_FILE="./tmp.proposal_parameters.json"
+  mkdir -p runtime-inputs
+  PROPOSALS_PARAMETERS_FILE="./runtime-inputs/proposal-parameters-input.json"
   echo $ALL_PROPOSALS_PARAMETERS_JSON > $PROPOSALS_PARAMETERS_FILE
 fi
 
@@ -34,7 +39,6 @@ ${TAR} -c --sort=name --owner=root:0 --group=root:0 --mode 644 --mtime='UTC 2020
     joystream-node.Dockerfile \
     joystream-node-armv7.Dockerfile \
     node \
-    $(test -n "$TEST_NODE" && echo "$TEST_PROPOSALS_PARAMETERS_PATH") \
     $PROPOSALS_PARAMETERS_FILE \
     | if [[ -n "$TEST_NODE" ]]; then ${SED} '$a'"$TEST_NODE_BLOCKTIME"; else tee; fi \
     | shasum \