diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index adbe923a03..4ef624064d 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -251,36 +251,6 @@ jobs: -l1_chain_id=${{ vars.L1_CHAIN_ID }} \ start' - - update-loadbalancer: - needs: - - build - - deploy - runs-on: ubuntu-latest - environment: - name: ${{ github.event.inputs.testnet_type }} - steps: - - uses: actions/checkout@v3 - - - name: 'Login via Azure CLI' - uses: azure/login@v1 - with: - creds: ${{ secrets.AZURE_CREDENTIALS }} - - - name: 'Remove existing backend nodes from the load balancer' - run: ./.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh ${{ github.event.inputs.testnet_type }} - - - name: 'Add load balancer address pool to the IP configuration' - uses: azure/CLI@v1 - with: - inlineScript: | - az network nic ip-config address-pool add \ - --address-pool ${{ github.event.inputs.testnet_type }}-backend-pool \ - --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }} \ - --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }}VMNic \ - --resource-group Testnet \ - --lb-name ${{ github.event.inputs.testnet_type }}-loadbalancer - check-obscuro-is-healthy: needs: - build @@ -337,6 +307,34 @@ jobs: deploy-l2-contracts.out retention-days: 7 + update-loadbalancer: + needs: + - check-obscuro-is-healthy + runs-on: ubuntu-latest + environment: + name: ${{ github.event.inputs.testnet_type }} + steps: + - uses: actions/checkout@v3 + + - name: 'Login via Azure CLI' + uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - name: 'Remove existing backend nodes from the load balancer' + run: ./.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh ${{ github.event.inputs.testnet_type }} + + - name: 'Add load balancer address pool to the IP configuration' + uses: azure/CLI@v1 + with: + inlineScript: | + az network nic ip-config address-pool add \ + --address-pool ${{ github.event.inputs.testnet_type }}-backend-pool \ + --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }} \ + --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }}VMNic \ + --resource-group Testnet \ + --lb-name ${{ github.event.inputs.testnet_type }}-loadbalancer + deploy-faucet: name: 'Trigger Faucet deployment for dev- / testnet on a new deployment' uses: ./.github/workflows/manual-deploy-testnet-faucet.yml diff --git a/.github/workflows/manual-deploy-testnet-validator.yml b/.github/workflows/manual-deploy-testnet-validator.yml index 0e1490f6f1..6314bfeeeb 100644 --- a/.github/workflows/manual-deploy-testnet-validator.yml +++ b/.github/workflows/manual-deploy-testnet-validator.yml @@ -194,8 +194,7 @@ jobs: # # update-loadbalancer: # needs: -# - build -# - deploy +# - check-obscuro-is-healthy # runs-on: ubuntu-latest # environment: # name: ${{ github.event.inputs.testnet_type }}