Преглед изворни кода

Add skip .env to start script

Anuj Bansal пре 3 година
родитељ
комит
2871625513
3 измењених фајлова са 15 додато и 11 уклоњено
  1. 8 8
      .pipelines/deploy-node-network-inputs.json
  2. 1 0
      devops/aws/roles/rpc/tasks/main.yml
  3. 6 3
      start.sh

+ 8 - 8
.pipelines/deploy-node-network-inputs.json

@@ -1,15 +1,15 @@
 {
   "gitRepo": {
     "description": "Code repository",
-    "value": "https://github.com/Joystream/joystream.git"
+    "value": "https://github.com/ahhda/joystream.git"
   },
   "branchName": {
     "description": "Branch to deploy",
-    "value": "master"
+    "value": "infra-fixes-testing"
   },
   "keyName": {
     "description": "SSH key pair on AWS",
-    "value": "joystream-github-action-key"
+    "value": "anuj-key"
   },
   "numberOfValidators": {
     "description": "Number of validators to deploy",
@@ -17,15 +17,15 @@
   },
   "validatorInstanceType": {
     "description": "AWS EC2 instance type for Validators (t2.micro, t2.large)",
-    "value": "t2.micro"
+    "value": "t2.medium"
   },
   "buildInstanceType": {
     "description": "AWS EC2 instance type for Build Instance (t2.micro, t2.large)",
-    "value": "t2.large"
+    "value": "t2.xlarge"
   },
   "rpcInstanceType": {
     "description": "AWS EC2 instance type for RPC (t2.micro, t2.large)",
-    "value": "t2.micro"
+    "value": "t2.xlarge"
   },
   "ec2AMI": {
     "description": "Pre-built AMI ID (ami-095792100b6e43a67)",
@@ -41,7 +41,7 @@
   },
   "networkSuffix": {
     "description": "Network suffix that will be added to the network name",
-    "value": "8129"
+    "value": "8134"
   },
   "initialBalancesFile": {
     "description": "HTTP Link to the Initial Balances file",
@@ -65,6 +65,6 @@
   },
   "skipChainSetup": {
     "description": "Set to true to skip running setup new chain scenario",
-    "value": true
+    "value": false
   }
 }

+ 1 - 0
devops/aws/roles/rpc/tasks/main.yml

@@ -48,6 +48,7 @@
     JOYSTREAM_NODE_WS: 'ws://{{ inventory_hostname }}:9944/'
     COLOSSUS_1_URL: 'https://{{ inventory_hostname }}.nip.io/colossus-1/'
     DISTRIBUTOR_1_URL: 'https://{{ inventory_hostname }}.nip.io/distributor-1/'
+    COLOSSUS_1_TRANSACTOR_URI: '//Colossus1'
     SKIP_NODE: 'true'
     SKIP_CHAIN_SETUP: '{{ skip_chain_setup }}'
   args:

+ 6 - 3
start.sh

@@ -36,9 +36,12 @@ docker-compose up -d orion
 
 ## Init the chain with some state
 if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
-  set -a
-  . ./.env
-  set +a
+  if [ "${SKIP_NODE}" != true ]
+  then
+    set -a
+    . ./.env
+    set +a
+  fi
 
   export SKIP_MOCK_CONTENT=true
   export SKIP_QUERY_NODE_CHECKS=true