feature(main): remove docker and containerd ci (#3765) (#3766) (#3767)

* feature(main): remove docker and containerd ci --------- Signed-off-by: cuisongliu <cuisongliu@qq.com> Co-authored-by: cuisongliu <cuisongliu@qq.com>
labring · Aug 26, 2023 · b923bf0 · b923bf0
1 parent 3d1cbf6
commit b923bf0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/.github/workflows/ci-patch-image.yml b/.github/workflows/ci-patch-image.yml
@@ -96,6 +96,15 @@ jobs:
           -t ${DOCKER_REPO}:${{ env.GIT_COMMIT_SHORT_SHA }} \
           -f Dockerfile.main \
           .
+          docker buildx build \
+          --platform linux/amd64,linux/arm64 \
+          --label "org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/sealos" \
+          --label "org.opencontainers.image.description=sealos  container image" \
+          --label "org.opencontainers.image.licenses=MIT" \
+          --push \
+          -t ${DOCKER_REPO}:latest \
+          -f Dockerfile.main \
+          .
 
   build-on-cluster-image:
     if: ${{ (github.event_name == 'push') || (inputs.push_mage == true) }}
@@ -122,7 +131,7 @@ jobs:
           SEALOS_ISSUE_LABEL: "dayly-report"
           SEALOS_ISSUE_TYPE: "day"
           SEALOS_ISSUE_REPO: "labring-actions/cluster-image"
-          SEALOS_COMMENT_BODY: "/imagebuild_apps sealos ${{ env.GIT_COMMIT_SHORT_SHA }}"
+          SEALOS_COMMENT_BODY: "/imagebuild_apps sealos latest"
   save-sealos:
     uses: ./.github/workflows/import-save-sealos.yml
   build-on-cluster-patch-image:

diff --git a/.github/workflows/e2e_test_core.yml b/.github/workflows/e2e_test_core.yml
@@ -64,7 +64,7 @@ jobs:
             E2E_sealos_runtime_version_docker_126_test,
             E2E_sealos_runtime_version_docker_127_test
           ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Download image-cri-shim
         uses: actions/download-artifact@v3
@@ -98,5 +98,10 @@ jobs:
 
       - name: Verify E2e test
         run: |
+          sudo apt-get remove docker docker-engine docker.io containerd runc
+          sudo apt-get purge docker-ce docker-ce-cli containerd.io # docker-compose-plugin
+          sudo apt-get remove -y moby-engine moby-cli moby-buildx moby-compose
+          sudo rm -rf /var/run/docker.sock
+          sudo rm -rf /run/containerd/containerd.sock
           sudo chmod a+x /tmp/e2e.test
           sudo /tmp/e2e.test --ginkgo.v --ginkgo.focus="${{ matrix.unit }}"
diff --git a/.github/workflows/e2e_test_image_cri_shim.yml b/.github/workflows/e2e_test_image_cri_shim.yml
@@ -26,7 +26,7 @@ jobs:
       image: false
   verify-image_cri_shim:
     needs: [ call_ci_workflow ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install Dependencies
         run: sudo apt update && sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
@@ -59,5 +59,10 @@ jobs:
         shell: bash
         working-directory: /tmp/
         run: |
+          sudo apt-get remove docker docker-engine docker.io containerd runc
+          sudo apt-get purge docker-ce docker-ce-cli containerd.io # docker-compose-plugin
+          sudo apt-get remove -y moby-engine moby-cli moby-buildx moby-compose
+          sudo rm -rf /var/run/docker.sock
+          sudo rm -rf /run/containerd/containerd.sock
           sudo chmod a+x /tmp/e2e.test
           sudo /tmp/e2e.test --ginkgo.v --ginkgo.focus="E2E_image-cri-shim_run_test"