Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dragonflyoss/dragonfly into feature…
Browse files Browse the repository at this point in the history
…/piece-length

Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi committed Feb 26, 2025
2 parents cb73ffb + 3d2eee6 commit c617434
Show file tree
Hide file tree
Showing 31 changed files with 218 additions and 232 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ jobs:
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -91,7 +91,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand All @@ -101,7 +101,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Dfdaemon Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/dfdaemon/Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/compatibility-e2e-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -100,7 +100,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand All @@ -111,7 +111,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Dfdaemon Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/dfdaemon/Dockerfile
Expand All @@ -122,7 +122,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build No Content Length Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: test/tools/no-content-length/
file: test/tools/no-content-length/Dockerfile
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
flags: ${{ matrix }}-compatibility-e2etests

- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: ${{ matrix.module }}-compatibility-e2e-tests-logs
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/compatibility-e2e-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ jobs:
include:
- module: manager
image: manager
image-tag: v2.2.1-rc.0
image-tag: v2.2.1-rc.1
chart-name: manager
skip: "Rate Limit"
- module: scheduler
image: scheduler
image-tag: v2.2.1-rc.0
image-tag: v2.2.1-rc.1
chart-name: scheduler
skip: "Rate Limit"
- module: client
image: client
image-tag: v0.2.11
image-tag: v0.2.14
chart-name: client
skip: "Rate Limit"
- module: seed-client
image: client
image-tag: v0.2.11
image-tag: v0.2.14
chart-name: seed-client
skip: "Rate Limit"

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -102,7 +102,7 @@ jobs:
docker tag dragonflyoss/dfinit:$CLIENT_TAG dragonflyoss/dfinit:latest
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -113,7 +113,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
flags: e2etests

- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: ${{ matrix.module }}-e2e-tests-logs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ jobs:
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Install Cosign
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a

- name: Login Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
Expand All @@ -83,7 +83,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push to Registry
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
sbom: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/e2e-v1-nydus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -56,7 +56,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand All @@ -67,7 +67,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Dfdaemon Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/dfdaemon/Dockerfile
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
docker exec kind-control-plane journalctl -u kubelet >> $log_dir/kubelet.log
- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: nydus-e2e-tests-logs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -111,7 +111,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand All @@ -122,7 +122,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Dfdaemon Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/dfdaemon/Dockerfile
Expand All @@ -133,7 +133,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build No Content Length Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: test/tools/no-content-length/
file: test/tools/no-content-length/Dockerfile
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
flags: e2etests

- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: ${{ matrix.module }}-e2e-tests-logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-v2-nydus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -67,7 +67,7 @@ jobs:
docker tag dragonflyoss/dfinit:$CLIENT_TAG dragonflyoss/dfinit:latest
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -78,7 +78,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
done
- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: nydus-e2e-tests-logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-v2-rate-limit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -85,7 +85,7 @@ jobs:
docker tag dragonflyoss/dfinit:$CLIENT_TAG dragonflyoss/dfinit:latest
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -96,7 +96,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
flags: e2etests

- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: ${{ matrix.module }}-e2e-tests-logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -86,7 +86,7 @@ jobs:
docker tag dragonflyoss/dfinit:$CLIENT_TAG dragonflyoss/dfinit:latest
- name: Build Scheduler Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/scheduler/Dockerfile
Expand All @@ -97,7 +97,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Build Manager Image
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
with:
context: .
file: build/images/manager/Dockerfile
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
flags: e2etests

- name: Upload Logs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: always()
with:
name: ${{ matrix.module }}-e2e-tests-logs
Expand Down
Loading

0 comments on commit c617434

Please sign in to comment.