compatibility test for arm and x64, fix code of trigger compatibility test after release build

leo-cai-timeplus · leo-cai-timeplus · commit b41446458aba · 2023-12-12T17:03:08.000+08:00
diff --git a/.github/workflows/compatibility_test.yml b/.github/workflows/compatibility_test.yml
@@ -12,14 +12,10 @@ on:
         required: false
         default: ''
 jobs:
-  upload_data:
-    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
-    with:
-      ec2-instance-type: ${{ vars.X64_INSTANCE_TYPE }}
-      ec2-image-id: ${{ vars.X64_TEST_AMI }}
-      ec2-volume-size: '30'
-      submodules: false
-      timeout: 30
+  prepare_upload_data:
+    if: ${{ github.event.inputs.source == '' || github.event.inputs.source == github.event.inputs.target }}
+    runs-on: ubuntu-latest
+    outputs:
       command: |
         export PROTON_VERSION=${{ github.event.inputs.target }}
 
@@ -49,38 +45,25 @@ jobs:
 
         cd $GITHUB_WORKSPACE
         tar -zcvf $PROTON_VERSION.tar.gz data
-        aws s3 cp --no-progress $PROTON_VERSION.tar.gz s3://tp-internal/proton/compatibility/oss/
-    secrets:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_REGION: ${{ secrets.AWS_REGION }}
-      AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
-      GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
-      TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
-      TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
-
-  compatibility_test:
-    if: ${{ github.event.inputs.source!='' }}
-    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
-    with:
-      ec2-instance-type: ${{ vars.X64_INSTANCE_TYPE }}
-      ec2-image-id: ${{ vars.X64_TEST_AMI }}
-      ec2-volume-size: '30'
-      submodules: false
-      timeout: 30
+        aws s3 cp --no-progress $PROTON_VERSION.tar.gz s3://tp-internal/proton/compatibility/oss/$ARCH/
+    steps:
+      - name: display command
+        run: |
+          echo 'command: ${{ steps.set_command.outputs.command }}'
+  prepare_compatibility_test:
+    if: ${{ github.event.inputs.source != '' && github.event.inputs.source != github.event.inputs.target }}
+    runs-on: ubuntu-latest
+    outputs:
       command: |
         export TARGET_VERSION=${{ github.event.inputs.target }}
         export SOURCE_VERSION=${{ github.event.inputs.source }}
         export PROTON_VERSION=$TARGET_VERSION
-
+        
         # prepare data
         cd $GITHUB_WORKSPACE
-        aws s3 cp --no-progress s3://tp-internal/proton/compatibility/oss/$SOURCE_VERSION.tar.gz .
+        aws s3 cp --no-progress s3://tp-internal/proton/compatibility/oss/$ARCH/$SOURCE_VERSION.tar.gz .
         tar -zxvf $SOURCE_VERSION.tar.gz
-
+        
         cd $GITHUB_WORKSPACE/tests/stream
         
         # make virtualenv
@@ -90,20 +73,82 @@ jobs:
         apt install python3-venv -y
         python -m venv env
         source env/bin/activate
-
+        
         pip install --upgrade pip
-
+        
         # FIXME: remove this line after pyyaml community fixed install bug
         pip install pyyaml==5.3.1
-
+        
         # FIXME(yokofly): docker 7.0.0 introduce a breaking change
         # https://github.com/docker/docker-py/issues/3194
         pip install docker==6.1.3
-
+        
         pip install -r helpers/requirements.txt
-
+        
         bash test_compatibility/basic_tests.sh
         bash test_compatibility/extra_tests.sh
+    steps:
+      - name: display command
+        run: |
+          echo 'command: ${{ steps.set_command.outputs.command }}'
+  upload_data_x64:
+    needs: [prepare_upload_data]
+    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
+    with:
+      ec2-instance-type: ${{ vars.X64_INSTANCE_TYPE }}
+      ec2-image-id: ${{ vars.X64_TEST_AMI }}
+      ec2-volume-size: '30'
+      submodules: false
+      timeout: 30
+      arch: ${{ vars.X64_ARCH }}
+      command: |
+        ${{ needs.prepare_upload_data.outputs.command }}
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+      GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
+      TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
+      TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
+  upload_data_arm:
+    needs: [prepare_upload_data]
+    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
+    with:
+      ec2-instance-type: ${{ vars.ARM_INSTANCE_TYPE }}
+      ec2-image-id: ${{ vars.ARM_TEST_AMI }}
+      ec2-volume-size: '30'
+      submodules: false
+      timeout: 30
+      arch: ${{ vars.ARM_ARCH }}
+      command: |
+        ${{ needs.prepare_upload_data.outputs.command }}
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+      GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
+      TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
+      TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
+  compatibility_test_x64:
+    needs: [prepare_compatibility_test]
+    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
+    with:
+      ec2-instance-type: ${{ vars.X64_INSTANCE_TYPE }}
+      ec2-image-id: ${{ vars.X64_TEST_AMI }}
+      ec2-volume-size: '30'
+      submodules: false
+      timeout: 30
+      arch: ${{ vars.X64_ARCH }}
+      command: |
+        ${{ needs.prepare_compatibility_test.outputs.command }}
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -115,3 +160,26 @@ jobs:
       TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
       TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
       TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
+  compatibility_test_arm:
+    needs: [prepare_compatibility_test]
+    uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
+    with:
+      ec2-instance-type: ${{ vars.ARM_INSTANCE_TYPE }}
+      ec2-image-id: ${{ vars.ARM_TEST_AMI }}
+      ec2-volume-size: '30'
+      submodules: false
+      timeout: 30
+      arch: ${{ vars.ARM_ARCH }}
+      command: |
+        ${{ needs.prepare_compatibility_test.outputs.command }}
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+      GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
+      TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
+      TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -169,6 +169,22 @@ jobs:
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/timeplus-io/proton/actions/workflows/manual_trigger_test.yml/dispatches \
           -d "{\"ref\":\"develop\",\"inputs\":{\"arch\": \"arm\", \"tag\":\"$PROTON_TAG-rc\"}}\""
+
+        # trigger compatibility test
+        export PROTON_VERSION=$PROTON_TAG
+        cd $GITHUB_WORKSPACE/tests/proton_ci
+
+        # make virtualenv
+        ln -s /usr/bin/python3 /usr/bin/python
+        apt-get update
+        systemctl stop unattended-upgrades
+        apt install python3-venv -y
+        python -m venv env
+        source env/bin/activate
+        pip install --upgrade pip
+
+        pip install -r requirements.txt
+        python run_compatibility_tests.py
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -177,26 +193,6 @@ jobs:
       GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-  Trigger_Compatibility_Tests:
-    needs: [CommitTag]
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v4
-      - name: setup python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: run command
-        run: |
-          ./release --version patch
-          export PROTON_VERSION=`grep "SET(VERSION_STRING" $GITHUB_WORKSPACE/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_STRING \(.*\)$/\1/' | sed 's/[) ].*//'`
-          echo "PROTON_VERSION=$PROTON_VERSION"
-          cd $GITHUB_WORKSPACE/tests/proton_ci
-          pip install -r requirements.txt
-          python run_compatibility_tests.py
-        env:
-          GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
   Build_Darwin_X86_64:
     uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
     with:
diff --git a/tests/proton_ci/run_compatibility_tests.py b/tests/proton_ci/run_compatibility_tests.py
@@ -1,4 +1,5 @@
 import json
+import logging
 import time
 from typing import List, Any
 
@@ -26,8 +27,9 @@ def valid_version_tag(tag_list: List[str]) -> Any:
         url="https://api.github.com/orgs/timeplus-io/packages/container/proton/versions?per_page=100",
         headers=HEADERS
     ).json()
+
     valid_version_list = []
-    current_version = ""
+    current_version = "latest"
     for version_info in proton_image_version_list:
         created_at = time.mktime(time.strptime(version_info['created_at'], "%Y-%m-%dT%H:%M:%SZ"))
         tags = version_info['metadata']['container']['tags']
@@ -36,22 +38,24 @@ def valid_version_tag(tag_list: List[str]) -> Any:
             continue
         if tag_name == PROTON_VERSION or tag_name == PROTON_VERSION + "-rc":
             current_version = tag_name
-            continue
         valid_version_list.append((created_at, tag_name))
+
     valid_version_list.sort(key=lambda version_tuple: -int(version_tuple[0]))
-    valid_version_list = valid_version_list[:min(len(valid_version_list), MAX_TEST_VERSION_NUM)]
-    if current_version == "":
-        print("Cannot find current proton version.")
+    valid_version_list = valid_version_list[:min(len(valid_version_list), MAX_TEST_VERSION_NUM + 1)]
+
     for _, version in valid_version_list:
-        response = requests.post(
-            "https://api.github.com/repos/timeplus-io/proton/actions/workflows/compatibility_test.yml/dispatches",
-            headers=HEADERS,
-            data=json.dumps({
-                "ref": "develop",
-                "inputs": {
-                    "source": version,
-                    "target": current_version
-                }
-            })
-        )
-        print(f'target="{current_version}", source="{version}", status_code="{response.status_code}"')
+        try:
+            response = requests.post(
+                "https://api.github.com/repos/timeplus-io/proton/actions/workflows/compatibility_test.yml/dispatches",
+                headers=HEADERS,
+                data=json.dumps({
+                    "ref": "develop",
+                    "inputs": {
+                        "source": version,
+                        "target": current_version
+                    }
+                })
+            )
+            assert response.status_code == 204
+        except Exception as e:
+            logging.error(e)
