* add aws v2

* add aws v2

* fix start script

* fix start script
This commit is contained in:
Liam 2023-08-24 23:56:27 +10:00 committed by GitHub
parent 0fcf13e842
commit 5153e05edc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions

2
.gitignore vendored
View file

@ -50,5 +50,5 @@ profile.cov
**/yarn-error.log **/yarn-error.log
coverage.txt coverage.txt
go.sum go.sum
cicd/devnet/terraform/.terraform cicd/devnet/terraform/.terraform*
cicd/devnet/tmp cicd/devnet/tmp

View file

@ -116,7 +116,7 @@ jobs:
- docker push xinfinorg/devnet:latest - docker push xinfinorg/devnet:latest
- stage: (Devnet)Terraform plan - stage: (Devnet)Terraform plan
if: branch = dev-upgrade AND type = pull_request if: branch = dev-upgrade AND type = push AND tag IS blank
dist: xenial dist: xenial
language: bash language: bash
install: install:
@ -142,7 +142,9 @@ jobs:
- unzip terraform_"$tf_version"_linux_amd64.zip - unzip terraform_"$tf_version"_linux_amd64.zip
- sudo mv terraform /usr/local/bin/ - sudo mv terraform /usr/local/bin/
- rm terraform_"$tf_version"_linux_amd64.zip - rm terraform_"$tf_version"_linux_amd64.zip
- pip install --user awscli # install aws cli w/o sudo - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
- unzip awscliv2.zip
- sudo ./aws/install
- export PATH=$PATH:$HOME/.local/bin # put aws in the path - export PATH=$PATH:$HOME/.local/bin # put aws in the path
script: script:
- echo "Merge detected, executing changes(Devnet)" - echo "Merge detected, executing changes(Devnet)"

View file

@ -18,11 +18,11 @@ then
echo "${private_key}" >> /tmp/key echo "${private_key}" >> /tmp/key
echo "Creating a new wallet" echo "Creating a new wallet"
wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
XDC --datadir /work/xdcchain init /work/genesis.json XDC --datadir /work/xdcchain init /work/genesis.json
else else
echo "Wallet already exist, re-use the same one" echo "Wallet already exist, re-use the same one"
wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
fi fi
input="/work/bootnodes.list" input="/work/bootnodes.list"

View file

@ -13,11 +13,11 @@ then
echo "${private_key}" >> /tmp/key echo "${private_key}" >> /tmp/key
echo "Creating a new wallet" echo "Creating a new wallet"
wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
XDC --datadir /work/xdcchain init /work/genesis.json XDC --datadir /work/xdcchain init /work/genesis.json
else else
echo "Wallet already exist, re-use the same one" echo "Wallet already exist, re-use the same one"
wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
fi fi
input="/work/bootnodes.list" input="/work/bootnodes.list"

View file

@ -13,11 +13,11 @@ then
echo "${private_key}" >> /tmp/key echo "${private_key}" >> /tmp/key
echo "Creating a new wallet" echo "Creating a new wallet"
wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
XDC --datadir /work/xdcchain init /work/genesis.json XDC --datadir /work/xdcchain init /work/genesis.json
else else
echo "Wallet already exist, re-use the same one" echo "Wallet already exist, re-use the same one"
wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | sed -n 's/Address: {\(.*\)}/\1/p') wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
fi fi
input="/work/bootnodes.list" input="/work/bootnodes.list"