feat: add e2e in ci & before build docker image

.github/workflows/build-docker-image.yml

@@ -19,8 +19,27 @@ on:
     branches:
       - main
       - release-*
+    paths-ignore:
+      - "docs/**"
+      - "README.md"
+      - "README_zh-CN.md"
+      - "**.md"
+      - "docs/**"
+      - "CONTRIBUTING.md"
     tags:
       - v*
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+      - release-*
+    paths-ignore:
+      - "docs/**"
+      - "README.md"
+      - "README_zh-CN.md"
+      - "**.md"
+      - "docs/**"
+      - "CONTRIBUTING.md"
   workflow_dispatch:
 
 env:
@@ -29,109 +48,101 @@ env:
 
 jobs:
   build-dockerhub:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout main repository
         uses: actions/checkout@v4
+        with:
+          path: main-repo
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-# docker.io/openim/openim-server:latest
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5.5.1
-        with:
-          images: openim/openim-server
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=ref,event=tag
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern=v{{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ./main-repo
-          # linux/ppc64le,linux/s390x
+          load: true
-          platforms: linux/amd64,linux/arm64
+          tags: "openim/openim-server:local"
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
 
-  build-aliyun:
+      - name: Checkout compose repository
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta2
-        uses: docker/metadata-action@v5.5.1
         with:
-          images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
+          repository: "openimsdk/openim-docker"
-          # generate Docker tags based on the following events/attributes
+          path: "compose-repo"
-          tags: |
+
-            type=ref,event=tag
+      - name: Update .env to use the local image
-            type=schedule
+        run: |
-            type=ref,event=branch
+          sed -i 's|OPENIM_SERVER_IMAGE=.*|OPENIM_SERVER_IMAGE=openim/openim-server:local|' ${{ github.workspace }}/compose-repo/.env
-            type=ref,event=pr
+
-            type=semver,pattern={{version}}
+      - name: Start services using Docker Compose
-            type=semver,pattern=v{{version}}
+        run: |
-            type=semver,pattern={{major}}.{{minor}}
+          cd ${{ github.workspace }}/compose-repo
-            type=semver,pattern={{major}}
+          docker compose up -d
-            type=sha
+          sleep 30
+
+      - name: Check openim-server health
+        run: |
+          timeout=300
+          interval=30
+          elapsed=0
+          while [[ $elapsed -le $timeout ]]; do
+            if ! docker exec openim-server mage check; then
+              echo "openim-server is not ready, waiting..."
+              sleep $interval
+              elapsed=$(($elapsed + $interval))
+            else
+              echo "Health check successful"
+              exit 0
+            fi
+          done
+          echo "Health check failed after 5 minutes"
+          exit 1
+
+      - name: Check openim-chat health
+        if: success()
+        run: |
+          if ! docker exec openim-chat mage check; then
+              echo "openim-chat check failed"
+              exit 1
+            else
+              echo "Health check successful"
+              exit 0
+            fi
 
-      - name: Log in to AliYun Docker Hub
+      - name: Checkout e2e
-        uses: docker/login-action@v3
+        if: success()
+        uses: actions/checkout@v4
         with:
-          registry: registry.cn-hangzhou.aliyuncs.com
+          repository: "openimsdk/test-e2e"
-          username: ${{ secrets.ALIREGISTRY_USERNAME }}
+          path: e2e-repo
-          password: ${{ secrets.ALIREGISTRY_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Set up Python 3.9
-        uses: docker/build-push-action@v5
+        uses: actions/setup-python@v4
         with:
-          context: .
+          python-version: '3.9'
-          # linux/ppc64le,linux/s390x
+      
-          platforms: linux/amd64,linux/arm64
+      - name: Install dependencies
-          push: ${{ github.event_name != 'pull_request' }}
+        run: |
-          tags: ${{ steps.meta2.outputs.tags }}
+          cd ${{ github.workspace }}/e2e-repo
-          labels: ${{ steps.meta2.outputs.labels }}
+          pip install PyYAML webdriver_manager selenium pytest
+      
+      - name: Run tests
+        run: |
+          cd ${{ github.workspace }}/e2e-repo
+          pytest main.py
 
-  build-ghcr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-# ghcr.io/openimsdk/openim-server:latest
       - name: Extract metadata (tags, labels) for Docker
-        id: meta3
+        if: success()
+        id: meta
         uses: docker/metadata-action@v5.5.1
         with:
-          images: ghcr.io/openimsdk/openim-server
+          images: |
+            openim/openim-server
+            ghcr.io/openimsdk/openim-server
+            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=tag
@@ -144,19 +155,33 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
 
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to Aliyun Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: registry.cn-hangzhou.aliyuncs.com
+          username: ${{ secrets.ALIREGISTRY_USERNAME }}
+          password: ${{ secrets.ALIREGISTRY_TOKEN }}
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ./main-repo
+          push: true
           # linux/ppc64le,linux/s390x
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
-          tags: ${{ steps.meta3.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
-          labels: ${{ steps.meta3.outputs.labels }}
+      

.github/workflows/openimci.yml

@@ -84,108 +84,38 @@ jobs:
         sudo mage start
         sudo mage check
 
+    - name: Checkout chat repository
+      uses: actions/checkout@v4
+      with:
+        repository: 'openimsdk/chat'
+        path: 'chat-repo'
+
+    - name: Build and Start Chat Services
+      run: |
+        cd ${{ github.workspace }}/chat-repo
+        sudo mage
+        sudo mage start
+        sudo mage check
+    
+    - name: Checkout e2e repository
+      uses: actions/checkout@v4
+      with:
+          repository: "openimsdk/test-e2e"
+          path: e2e-repo
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    
+    - name: Install dependencies
+      run: |
+        cd ${{ github.workspace }}/e2e-repo
+        pip install PyYAML webdriver_manager selenium pytest
+    
+    - name: Run tests
+      run: |
+        cd ${{ github.workspace }}/e2e-repo
+        pytest main.py
     
-#  build-mac:
-#    name: Execute OpenIM Script On macOS
-#    runs-on: macos-latest
-#    permissions:
-#      contents: write
-#      pull-requests: write
-#    environment:
-#      name: openim
-#    strategy:
-#      matrix:
-#        arch: [arm64, armv7, amd64]
-#    
-#    steps:
-#    - uses: actions/checkout@v3
-
-#    - name: Set up Go
-#      uses: actions/setup-go@v4
-#      with:
-#        go-version: '1.21'
-
-        
-#        while ! docker system info > /dev/null 2>&1; do
-#          echo "Waiting for Docker to start..."
-#          sleep 10  # Increased delay to ensure Docker starts properly
-#        done
-
-#    - name: Install Docker
-#      run: |
-#        brew install docker
-#        brew install docker-compose
-#        sleep 10
-#        docker-compose up -d
-#        sleep 30
-#      timeout-minutes: 20 
-#        
     
-#    - name: init
-#      run: sudo bash bootstrap.sh
-#      timeout-minutes: 20
-
-#    - name: Build, Start, Check Services and Print Logs for Linux
-#      run: |
-#        sudo mage
-#        sudo mage start
-#        sudo mage check
-        
-#    - name: Restart Services and Print Logs
-#      run: |
-#        sudo mage stop
-#        sudo mage start
-#        sudo mage check
-
-#  build-windows:
-#    name: Execute OpenIM Script On Windows
-#    runs-on: windows-latest
-#    permissions:
-#      contents: write
-#      pull-requests: write
-#    environment:
-#      name: openim
-#    strategy:
-#      matrix:
-#        arch: [arm64, armv7, amd64]
-#    
-#    steps:
-#    - uses: actions/checkout@v3
-
-#    - name: Set up Go
-#      uses: actions/setup-go@v4
-#      with:
-#        go-version: '1.21'
-
-#    - name: Set up Docker for Windows
-#      run: |
-#        $images = @("zookeeper", "redis", "kafka")
-#        foreach ($image in $images) {
-#          $tag = "$image:latest"
-#          docker pull $tag | Out-Null
-#          if ($LASTEXITCODE -ne 0) {
-#            Write-Host "Skipping $image as it is not available for Windows"
-#          } else {
-#            Write-Host "Successfully pulled $image"
-#          }
-#        }
-#        docker compose up -d
-#        Start-Sleep -Seconds 30
-#      timeout-minutes: 20
-#      shell: pwsh
-
-#    - name: init
-#      run: bootstrap.bat
-#      timeout-minutes: 20
-
-#    - name: Build, Start, Check Services and Print Logs for Linux
-#      run: |
-#        mage
-#        mage start
-#        mage check        
-
-#    - name: Restart Services and Print Logs
-#      run: |
-#        mage stop
-#        mage start
-#        mage check