update workflows

XinFinOrg · May 10, 2024 · 50e6260 · 50e6260
1 parent a48de06
commit 50e6260
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 222 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 name: Build and publish image 
 on:
   push:
@@ -9,7 +8,7 @@ on:
   workflow_dispatch: #allow manual trigger to workflow
 
 jobs:
-  test_build_and_push_to_docker_registry:
+  test_golang:
     name: Test, build and push image to registry
     runs-on: ubuntu-latest
     env:
@@ -18,12 +17,48 @@ jobs:
     defaults:
       run:
         working-directory: ${{ env.GOPATH }}/src/XDC-Subnet
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: A-B tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[a-b].*")
+          - name: C-[a-m] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[a-m].*")
+          - name: C-[n-o] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[n-o].*")
+          - name: C-[p-z] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[p-z].*")
+          - name: D-I tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[d-i].*")
+          - name: J-N tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[j-n].*")
+          - name: O-R tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[o-r].*")
+          - name: S tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/s.*")
+          - name: T-Z tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[t-z].*")
     steps:
       - name: Check out code
         uses: actions/checkout@v3
         with:
           path: ${{ env.GOPATH }}/src/XDC-Subnet
-
+      - name: Set up Go 1.21.x
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21.x" # The Go version to download (if necessary) and use.
+      - name: Run tests
+        run: ${{ matrix.script }}
+        env:
+            GO111MODULE: auto
+
+  test_nodejs:
+    name: Run nodejs tests
+    runs-on: ubuntu-latest
+    steps: 
+      - name: Check out code
+        uses: actions/checkout@v3
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -33,16 +68,12 @@ jobs:
           cd contracts/validator/src
           yarn 
           npx hardhat test
-      - name: Set up Go 1.21.x
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.21.x" # The Go version to download (if necessary) and use.
-      - name: Run tests
-        run: |
-          make test
-        env:
-          GO111MODULE: auto
 
+  build:
+    needs: [test_golang, test_nodejs]
+    name: Build and push image to registry
+    runs-on: ubuntu-latest
+    steps: 
       - name: Docker login
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
@@ -62,202 +93,4 @@ jobs:
       - name: Build and push image
         run: |
           docker build . --file docker/Dockerfile --tag ${{ steps.image.outputs.name }}
-          docker push ${{ steps.image.outputs.name }}
-
-=======
-name: CI
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - '*'
-    tags:
-      - '*'
-
-env:
-  GOPROXY: https://proxy.golang.org
-  GO111MODULE: on
-  tf_version: "1.3.0"
-  tf_init_cli_options: "-input=false"
-  tf_validation_cli_options: ""
-  tf_plan_cli_options: "-lock=false -input=false"
-  tf_apply_cli_options: "-auto-approve -input=false"
-
-jobs:
-  tests:
-    env:
-      GOPATH: ${{ github.workspace }}
-      GOBIN: ${{ github.workspace }}/bin
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ${{ env.GOPATH }}/src/XDPoSChain
-    strategy:
-      matrix:
-        include:
-          - name: A-B tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/[a-b].*")
-          - name: C-[a-m] tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/c[a-m].*")
-          - name: C-[n-o] tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/c[n-o].*")
-          - name: C-[p-z] tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/c[p-z].*")
-          - name: D-I tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/[d-i].*")
-          - name: J-N tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/[j-n].*")
-          - name: O-R tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/[o-r].*")
-          - name: S tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/s.*")
-          - name: T-Z tests
-            script: go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDPoSChain/[t-z].*")
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          path: ${{ env.GOPATH }}/src/XDPoSChain
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          cache: false
-          go-version: '1.21.x'
-      - name: Run tests
-        run: ${{ matrix.script }}
-        env:
-          GO111MODULE: auto
-
-  tag_build:
-    runs-on: ubuntu-latest
-    needs: tests
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: Build Docker image
-        run: docker build -t xinfinorg/xdposchain:${GITHUB_REF#refs/tags/} -f cicd/Dockerfile .
-      - name: Push Docker image
-        run: docker push xinfinorg/xdposchain:${GITHUB_REF#refs/tags/}
-
-  devnet_build_push:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: tests
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: Build and Push Docker images
-        run: |
-          git_hash=$(git rev-parse --short "$GITHUB_SHA")
-          docker pull xinfinorg/devnet:latest
-          docker tag xinfinorg/devnet:latest xinfinorg/devnet:previous
-          docker rmi xinfinorg/devnet:latest
-          docker build -t xinfinorg/devnet:latest -f cicd/Dockerfile .
-          docker tag xinfinorg/devnet:latest xinfinorg/devnet:dev-upgrade-${git_hash}
-          docker push xinfinorg/devnet:dev-upgrade-${git_hash}
-          docker push xinfinorg/devnet:latest
-          docker push xinfinorg/devnet:previous
-
-  devnet_terraform_apply:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: devnet_build_push
-    environment: devnet
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Terraform Apply
-        run: |
-          git_hash=$(git rev-parse --short "$GITHUB_SHA")
-          cd cicd/devnet/terraform
-          terraform init ${{ env.tf_init_cli_options }}
-          terraform apply -var "docker_tag=dev-upgrade-${git_hash}" ${{ env.tf_apply_cli_options }}
-          sleep 5
-          source .env
-          for ((i=$us_east_2_start;i<$us_east_2_end;i++)); do
-            echo "Force deploy xdc-$i"
-            aws ecs update-service --region us-east-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager | head -n 10;
-          done
-          for ((i=$eu_west_1_start;i<$eu_west_1_end;i++)); do
-            echo "Force deploy xdc-$i"
-            aws ecs update-service --region eu-west-1 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager | head -n 10;
-          done
-          for ((i=$ap_southeast_2_start;i<$ap_southeast_2_end;i++)); do
-            echo "Force deploy xdc-$i"
-            aws ecs update-service --region ap-southeast-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager | head -n 10;
-          done
-
-  rpcnode_terraform_apply:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: devnet_build_push
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Terraform Apply
-        run: |
-          cd cicd/terraform
-          terraform init ${{ env.tf_init_cli_options }}
-          terraform apply ${{ env.tf_apply_cli_options }}
-
-  devnet_dev-upgrade_node:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: rpcnode_terraform_apply
-    environment: devnet
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: ECS Update
-        run: |
-          aws ecs update-service --region ap-southeast-1 --cluster devnet-xdcnode-cluster --service ecs-service-rpc1 --force-new-deployment --no-cli-pager | head -n 10;
-
-  testnet_dev-upgrade_node:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: rpcnode_terraform_apply
-    environment: testnet
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: ECS Update
-        run: |
-          aws ecs update-service --region ap-southeast-1 --cluster testnet-xdcnode-cluster --service ecs-service-testnet-rpc1 --force-new-deployment --no-cli-pager | head -n 10;
-
-  mainnet_dev-upgrade_node:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    needs: rpcnode_terraform_apply
-    environment: mainnet
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: ECS Update
-        run: |
-          aws ecs update-service --region ap-southeast-1 --cluster mainnet-xdcnode-cluster --service ecs-service-mainnet-rpc1 --force-new-deployment --no-cli-pager | head -n 10;
-
-  devnet_send_notification:
-    runs-on: ubuntu-latest
-    needs: devnet_terraform_apply
-    if: github.ref == 'refs/heads/dev-upgrade' && !startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Send deployment notification
-        run: |
-          curl --location --request POST "66.94.98.186:8080/deploy?environment=devnet&service=xdc&version=${GITHUB_SHA}"
->>>>>>> fd8e7c9d624a085c70178ec7c8de7da274fe0a7c
+          docker push ${{ steps.image.outputs.name }}
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -3,22 +3,63 @@ on:
   pull_request:
     branches:
       - master
+  #TODO: remove push trigger
+  push:   #temporary trigger tests this way 
+    branches:
+      - '*'
 
 jobs:
-  test_on_pr:
-    name: Run tests on PR
+  test_golang:
+    name: Run golang tests
     runs-on: ubuntu-latest
     env:
       GOPATH: ${{ github.workspace }}
       GOBIN: ${{ github.workspace }}/bin
     defaults:
       run:
         working-directory: ${{ env.GOPATH }}/src/XDC-Subnet
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: A-B tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[a-b].*")
+          - name: C-[a-m] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[a-m].*")
+          - name: C-[n-o] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[n-o].*")
+          - name: C-[p-z] tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/c[p-z].*")
+          - name: D-I tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[d-i].*")
+          - name: J-N tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[j-n].*")
+          - name: O-R tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[o-r].*")
+          - name: S tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/s.*")
+          - name: T-Z tests
+            script: mv common/constants/constants.go.unittest common/constants.go; go run build/ci.go test -coverage $(go list ./... | grep "github.com/XinFinOrg/XDC-Subnet/[t-z].*")
     steps:
       - name: Check out code
         uses: actions/checkout@v3
         with:
           path: ${{ env.GOPATH }}/src/XDC-Subnet
+      - name: Set up Go 1.21.x
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21.x" # The Go version to download (if necessary) and use.
+      - name: Run tests
+        run: ${{ matrix.script }}
+        env:
+          GO111MODULE: auto
+
+  test_nodejs:
+    name: Run nodejs tests
+    runs-on: ubuntu-latest
+    steps: 
+      - name: Check out code
+        uses: actions/checkout@v3
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -28,12 +69,3 @@ jobs:
           cd contracts/validator/src
           yarn 
           npx hardhat test
-      - name: Set up Go 1.21.x
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.21.x" # The Go version to download (if necessary) and use.
-      - name: Run tests
-        run: |
-          make test
-        env:
-          GO111MODULE: auto