diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19d914017d70..a2e7daecfeef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,24 +116,24 @@ jobs: echo "${{ secrets.KUBE_CONFIG }}" | base64 --decode > $HOME/.kube/config chmod 600 $HOME/.kube/config git_hash=$(git rev-parse --short "$GITHUB_SHA") - kubectl set image deployment/devnet1 devnet1=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet2 devnet2=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet3 devnet3=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet4 devnet4=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet5 devnet5=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet6 devnet6=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet7 devnet7=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet8 devnet8=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet9 devnet9=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet10 devnet10=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet11 devnet11=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet12 devnet12=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet13 devnet13=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet14 devnet14=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet15 devnet15=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet16 devnet16=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet17 devnet17=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/devnet18 devnet18=xinfinorg/devnet:dev-upgrade-${git_hash} || + kubectl set image deployment/devnet1 devnet1=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet2 devnet2=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet3 devnet3=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet4 devnet4=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet5 devnet5=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet6 devnet6=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet7 devnet7=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet8 devnet8=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet9 devnet9=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet10 devnet10=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet11 devnet11=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet12 devnet12=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet13 devnet13=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet14 devnet14=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet15 devnet15=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet16 devnet16=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet17 devnet17=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/devnet18 devnet18=xinfinorg/devnet:dev-upgrade-${git_hash} ; echo done rpc_k8_apply: @@ -152,9 +152,9 @@ jobs: echo "${{ secrets.KUBE_CONFIG }}" | base64 --decode > $HOME/.kube/config chmod 600 $HOME/.kube/config git_hash=$(git rev-parse --short "$GITHUB_SHA") - kubectl set image deployment/devnetrpc devnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/testnetrpc testnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || - kubectl set image deployment/mainnetrpc mainnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} || + kubectl set image deployment/devnetrpc devnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/testnetrpc testnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} ; + kubectl set image deployment/mainnetrpc mainnetrpc=xinfinorg/devnet:dev-upgrade-${git_hash} ; echo done devnet_send_notification: diff --git a/.github/workflows/deploy_rpc_image.yml b/.github/workflows/deploy_rpc_image.yml deleted file mode 100644 index 088d809aeee8..000000000000 --- a/.github/workflows/deploy_rpc_image.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Deploy RPC Image -on: - #need to make sure only authorized people can use this function - workflow_dispatch: - inputs: - network: - type: choice - description: 'devnet, testnet, or mainnet' - options: - - devnet - - testnet - - mainnet - rpc_image: - description: 'full image name' - -jobs: - ansible: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Update RPC nodes image - uses: dawidd6/action-ansible-playbook@v2 - with: - playbook: playbooks/update-image.yaml - directory: ./cicd/ansible - key: ${{secrets.SSH_PRIVATE_KEY_DEVNET}} - options: | - --inventory inventory.yaml - --extra-vars network=${{inputs.network}} - --extra-vars rpc_image=${{inputs.rpc_image}} - - devnet_send_notification: - runs-on: ubuntu-latest - needs: ansible - steps: - - uses: actions/checkout@v4 - - name: Send deployment notification - run: | - curl --location --request POST "66.94.98.186:8080/deploy?environment=${{inputs.network}}&service=xdc_rpc&version=${{inputs.rpc_image}}" diff --git a/cicd/ansible/inventory.yaml b/cicd/ansible/inventory.yaml deleted file mode 100644 index 141604ff7c7d..000000000000 --- a/cicd/ansible/inventory.yaml +++ /dev/null @@ -1,17 +0,0 @@ -ec2_rpcs: - hosts: - devnet: - ansible_host: devnet.hashlabs.apothem.network - ansible_port: 22 - ansible_user: ec2-user - deploy_path: /work/XinFin-Node/devnet - testnet: - ansible_host: testnet.hashlabs.apothem.network - ansible_port: 22 - ansible_user: ec2-user - deploy_path: /work/XinFin-Node/testnet - mainnet: - ansible_host: mainnet.hashlabs.apothem.network - ansible_port: 22 - ansible_user: ec2-user - deploy_path: /work/XinFin-Node/mainnet \ No newline at end of file diff --git a/cicd/ansible/playbooks/update-image.yaml b/cicd/ansible/playbooks/update-image.yaml deleted file mode 100644 index a55ac6a7ece9..000000000000 --- a/cicd/ansible/playbooks/update-image.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Run Bash Script on Host - hosts: "{{ network }}" - become: true #sudo/root - - tasks: - - name: Update RPC image version - shell: | - export RPC_IMAGE={{ rpc_image }} - cd {{ deploy_path }} - git pull - ./docker-down.sh - ./docker-up-hash.sh - docker ps - register: output - - debug: var=output.stdout_lines \ No newline at end of file diff --git a/cicd/devnet/bootnodes.list b/cicd/devnet/bootnodes.list index d3b1228edd76..03a7f014e51b 100644 --- a/cicd/devnet/bootnodes.list +++ b/cicd/devnet/bootnodes.list @@ -1,4 +1,4 @@ enode://00d49d72a48164681906ad61924568da0d3049937efdbaed0b7533e34a99f55814f1839d909cdc82f78e04a36ac04737d80b41b22905c7d6cac3c80bb5cdbbc4@66.94.98.186:30301 enode://d6793b02a478f13ed6d01c30778935f6f8f7461a75aebedcb310def4ed9b066f995a0dca046d0c7ea7f5ffdd8e3f1f53c6b6dce909d1693650504921aad62f1a@194.163.167.177:30301 -enode://c7a38ecc7fd5849eaefb3e928f882ab2f1260d5591bd1fef1db39c8ae0d9fe21d86e2d4efee6def0f4f16d0b6103f86f92f7e910295b849266fef83f05768596@10.244.1.77:30301 -enode://9160713d41656154ce3fdaa9d0f9799dd8546652b1784edecf82ce7a5b54a977f897ea617a9b3b4db513dc6b0dc98c1c3ad8a1914075ab87ded4e367c89dcd3b@10.244.2.53:30301 +enode://64e1b1969f9102977691a40431b0b672055dcf31163897d996434420e6c95dc9c16f60c7c11fc3c9eb27fa26a9035b669bfb77d21cef371ddce94e329222550c@100.42.189.174:30301 +enode://5a95a9ce5aa070ee8ae158988a0b9e34e98e6371f05f4318f88c1b7e2c8123877c95583b1f530858b7b580a9d906a38a8bffbc3c095fc9ef5eb7b339a112da67@209.126.80.43:30302 diff --git a/params/config.go b/params/config.go index 6630f9b197b6..cb67859d9076 100644 --- a/params/config.go +++ b/params/config.go @@ -110,30 +110,6 @@ var ( TimeoutPeriod: 30, MinePeriod: 2, }, - 7956000: { // 2024.01.17 Devnet Deplyment Issue - MaxMasternodes: 108, - SwitchRound: 7956000, - CertThreshold: 0.4, - TimeoutSyncThreshold: 3, - TimeoutPeriod: 30, - MinePeriod: 2, - }, - 7974000: { - MaxMasternodes: 108, - SwitchRound: 7974000, - CertThreshold: 0.667, - TimeoutSyncThreshold: 3, - TimeoutPeriod: 30, - MinePeriod: 2, - }, - 13625855: { // 2024.07.29 RPC call and reorg sync issue - MaxMasternodes: 108, - SwitchRound: 13625855, - CertThreshold: 0.4, - TimeoutSyncThreshold: 3, - TimeoutPeriod: 60, - MinePeriod: 2, - }, } UnitTestV2Configs = map[uint64]*V2Config{