ci: update ci flow

bytedance · May 14, 2024 · 27eecc2 · 27eecc2
1 parent 7d4102c
commit 27eecc2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 114 deletions.
diff --git a/.github/workflows/Elkeid_driver_build.yml b/.github/workflows/Elkeid_driver_build.yml
@@ -696,7 +696,7 @@ jobs:
       with:
         name: elkeid_driver_ol8_uek_x86_64
         path: ${{steps.extract-ol8_uek.outputs.destination}}
-  build_oracle7_x86_64:
+  build_ol9_uek_x86_64:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
@@ -708,80 +708,37 @@ jobs:
       with:
         password: ${{secrets.DOCKERHUB_TOKEN}}
         username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Set up Docker Buildx oracle7
+    - name: Set up Docker Buildx ol9_uek
       uses: docker/setup-buildx-action@v2
-    - name: Build oracle7
+    - name: Build ol9_uek
       uses: docker/build-push-action@v3
       timeout-minutes: 300
       with:
         context: .
-        file: driver/dockerfiles.x86_64/Dockerfile.oracle7
+        file: driver/dockerfiles.x86_64/Dockerfile.ol9_uek
         load: false
         push: true
-        tags: elkeidteam/elkeid_driver_oracle7_x86_64:latest
-    - name: Docker Hub Description oracle7
+        tags: elkeidteam/elkeid_driver_ol9_uek_x86_64:latest
+    - name: Docker Hub Description ol9_uek
       uses: peter-evans/dockerhub-description@v3
       with:
         password: ${{secrets.DOCKERHUB_TOKEN}}
-        repository: elkeidteam/elkeid_driver_oracle7_x86_64
+        repository: elkeidteam/elkeid_driver_ol9_uek_x86_64
         short-description: ${{github.event.repository.description}}
         username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Extract oracle7
+    - name: Extract ol9_uek
       if: always()
-      id: extract-oracle7
+      id: extract-ol9_uek
       uses: shrink/actions-docker-extract@v2
       with:
-        image: elkeidteam/elkeid_driver_oracle7_x86_64:latest
+        image: elkeidteam/elkeid_driver_ol9_uek_x86_64:latest
         path: /ko_output/.
-    - name: Upload oracle7
+    - name: Upload ol9_uek
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: elkeid_driver_oracle7_x86_64
-        path: ${{steps.extract-oracle7.outputs.destination}}
-  build_oracle8_uek_x86_64:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: false
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        password: ${{secrets.DOCKERHUB_TOKEN}}
-        username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Set up Docker Buildx oracle8_uek
-      uses: docker/setup-buildx-action@v2
-    - name: Build oracle8_uek
-      uses: docker/build-push-action@v3
-      timeout-minutes: 300
-      with:
-        context: .
-        file: driver/dockerfiles.x86_64/Dockerfile.oracle8_uek
-        load: false
-        push: true
-        tags: elkeidteam/elkeid_driver_oracle8_uek_x86_64:latest
-    - name: Docker Hub Description oracle8_uek
-      uses: peter-evans/dockerhub-description@v3
-      with:
-        password: ${{secrets.DOCKERHUB_TOKEN}}
-        repository: elkeidteam/elkeid_driver_oracle8_uek_x86_64
-        short-description: ${{github.event.repository.description}}
-        username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Extract oracle8_uek
-      if: always()
-      id: extract-oracle8_uek
-      uses: shrink/actions-docker-extract@v2
-      with:
-        image: elkeidteam/elkeid_driver_oracle8_uek_x86_64:latest
-        path: /ko_output/.
-    - name: Upload oracle8_uek
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: elkeid_driver_oracle8_uek_x86_64
-        path: ${{steps.extract-oracle8_uek.outputs.destination}}
+        name: elkeid_driver_ol9_uek_x86_64
+        path: ${{steps.extract-ol9_uek.outputs.destination}}
   build_rhel6_x86_64:
     runs-on: ubuntu-latest
     continue-on-error: true

diff --git a/.github/workflows/Elkeid_driver_release.yml b/.github/workflows/Elkeid_driver_release.yml
@@ -686,7 +686,7 @@ jobs:
       with:
         name: elkeid_driver_ol8_uek_x86_64
         path: ${{steps.extract-ol8_uek.outputs.destination}}
-  build_oracle7_x86_64:
+  build_ol9_uek_x86_64:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
@@ -698,80 +698,37 @@ jobs:
       with:
         password: ${{secrets.DOCKERHUB_TOKEN}}
         username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Set up Docker Buildx oracle7
+    - name: Set up Docker Buildx ol9_uek
       uses: docker/setup-buildx-action@v2
-    - name: Build oracle7
+    - name: Build ol9_uek
       uses: docker/build-push-action@v3
       timeout-minutes: 300
       with:
         context: .
-        file: driver/dockerfiles.x86_64/Dockerfile.oracle7
+        file: driver/dockerfiles.x86_64/Dockerfile.ol9_uek
         load: false
         push: true
-        tags: elkeidteam/elkeid_driver_oracle7_x86_64:latest
-    - name: Docker Hub Description oracle7
+        tags: elkeidteam/elkeid_driver_ol9_uek_x86_64:latest
+    - name: Docker Hub Description ol9_uek
       uses: peter-evans/dockerhub-description@v3
       with:
         password: ${{secrets.DOCKERHUB_TOKEN}}
-        repository: elkeidteam/elkeid_driver_oracle7_x86_64
+        repository: elkeidteam/elkeid_driver_ol9_uek_x86_64
         short-description: ${{github.event.repository.description}}
         username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Extract oracle7
+    - name: Extract ol9_uek
       if: always()
-      id: extract-oracle7
+      id: extract-ol9_uek
       uses: shrink/actions-docker-extract@v2
       with:
-        image: elkeidteam/elkeid_driver_oracle7_x86_64:latest
+        image: elkeidteam/elkeid_driver_ol9_uek_x86_64:latest
         path: /ko_output/.
-    - name: Upload oracle7
+    - name: Upload ol9_uek
       uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: elkeid_driver_oracle7_x86_64
-        path: ${{steps.extract-oracle7.outputs.destination}}
-  build_oracle8_uek_x86_64:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: false
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        password: ${{secrets.DOCKERHUB_TOKEN}}
-        username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Set up Docker Buildx oracle8_uek
-      uses: docker/setup-buildx-action@v2
-    - name: Build oracle8_uek
-      uses: docker/build-push-action@v3
-      timeout-minutes: 300
-      with:
-        context: .
-        file: driver/dockerfiles.x86_64/Dockerfile.oracle8_uek
-        load: false
-        push: true
-        tags: elkeidteam/elkeid_driver_oracle8_uek_x86_64:latest
-    - name: Docker Hub Description oracle8_uek
-      uses: peter-evans/dockerhub-description@v3
-      with:
-        password: ${{secrets.DOCKERHUB_TOKEN}}
-        repository: elkeidteam/elkeid_driver_oracle8_uek_x86_64
-        short-description: ${{github.event.repository.description}}
-        username: ${{secrets.DOCKERHUB_USERNAME}}
-    - name: Extract oracle8_uek
-      if: always()
-      id: extract-oracle8_uek
-      uses: shrink/actions-docker-extract@v2
-      with:
-        image: elkeidteam/elkeid_driver_oracle8_uek_x86_64:latest
-        path: /ko_output/.
-    - name: Upload oracle8_uek
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: elkeid_driver_oracle8_uek_x86_64
-        path: ${{steps.extract-oracle8_uek.outputs.destination}}
+        name: elkeid_driver_ol9_uek_x86_64
+        path: ${{steps.extract-ol9_uek.outputs.destination}}
   build_rhel6_x86_64:
     runs-on: ubuntu-latest
     continue-on-error: true
@@ -2597,6 +2554,7 @@ jobs:
     - build_debian11_x86_64
     - build_rocky9_x86_64
     - build_ubuntu1604_auzre_x86_64
+    - build_ol9_uek_x86_64
     - build_ubuntu1404_k3_x86_64
     - build_amazonlinux2_54_x86_64
     - build_ubuntu1204_x86_64
@@ -2609,13 +2567,11 @@ jobs:
     - build_rocky8_x86_64
     - build_ubuntu1404_k4_x86_64
     - build_ubuntu1804_x86_64
-    - build_oracle8_uek_x86_64
     - build_rhel8_plus_x86_64
     - build_rhel7_elrepo_lt_archive_x86_64
     - build_ubuntu2004_azure_x86_64
     - build_debian9_x86_64
     - build_rhel8_elrepo_ml_x86_64
-    - build_oracle7_x86_64
     - build_rhel7_elrepo_lt_x86_64
     - build_ubuntu1604_k410_x86_64
     - build_ubuntu1604_aws_x86_64