diff --git a/.github/workflows/deploy-playground.yml b/.github/workflows/deploy-playground.yml index ad0df69b37..d7f52939c4 100644 --- a/.github/workflows/deploy-playground.yml +++ b/.github/workflows/deploy-playground.yml @@ -19,7 +19,15 @@ on: description: 'AWS EC2 instance type (t2.micro, t2.large)' required: false default: 't2.micro' - + stackNamePrefix: + description: 'Additional identifier to include in stack name' + required: false + default: 'playground' + # TODO: customDomain instead of ip_address.nip.io + # customDomain: + # description: 'DNS hostname to use for deployment' + # required: false + # default: '' defaults: run: working-directory: devops/aws @@ -29,7 +37,7 @@ jobs: name: Create an EC2 instance and configure docker-compose stack runs-on: ubuntu-latest env: - STACK_NAME: joystream-playground-${{ github.event.inputs.branchName }}-${{ github.run_number }} + STACK_NAME: ${{ github.event.inputs.stackNamePrefix }}-${{ github.event.inputs.branchName }}-${{ github.run_number }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/devops/aws/deploy-playground-playbook.yml b/devops/aws/deploy-playground-playbook.yml index e95ad1b029..ed0db31d35 100644 --- a/devops/aws/deploy-playground-playbook.yml +++ b/devops/aws/deploy-playground-playbook.yml @@ -62,8 +62,8 @@ chdir: '{{ remote_code_path }}' environment: PERSIST: 'true' - COLOSSUS_1_NODE_URI: 'https://{{ inventory_hostname }}.nip.io/colossus-1/' - DISTRIBUTOR_1_NODE_URI: 'https://{{ inventory_hostname }}.nip.io/distributor-1/' + COLOSSUS_1_URL: 'https://{{ inventory_hostname }}.nip.io/colossus-1/' + DISTRIBUTOR_1_URL: 'https://{{ inventory_hostname }}.nip.io/distributor-1/' async: 1800 poll: 0 register: compose_result diff --git a/start.sh b/start.sh index 485949924f..da379569f4 100755 --- a/start.sh +++ b/start.sh @@ -27,9 +27,9 @@ docker-compose up -d joystream-node ## Init the chain with some state export SKIP_MOCK_CONTENT=true HOST_IP=$(tests/network-tests/get-host-ip.sh) -export COLOSSUS_1_URL="http://${HOST_IP}:3333" +export COLOSSUS_1_URL=${COLOSSUS_1_URL:="http://${HOST_IP}:3333"} export COLOSSUS_1_TRANSACTOR_KEY=$(docker run --rm --pull=always docker.io/parity/subkey:2.0.1 inspect ${COLOSSUS_1_TRANSACTOR_URI} --output-type json | jq .ss58Address -r) -export DISTRIBUTOR_1_URL="http://${HOST_IP}:3334" +export DISTRIBUTOR_1_URL=${DISTRIBUTOR_1_URL:="http://${HOST_IP}:3334"} ./tests/network-tests/run-test-scenario.sh ${INIT_CHAIN_SCENARIO} ## Set sudo as the membership screening authority