Skip to content

Commit 67cc7f5

Browse files
authored
Add Docker Test Matrix (#380)
1 parent aefbc2d commit 67cc7f5

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

.github/workflows/cli-integration-tests.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -523,24 +523,42 @@ jobs:
523523
name: Docker ubuntu
524524
needs: Detect-Deps
525525
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'safe to test')
526+
strategy:
527+
fail-fast: false
528+
matrix:
529+
os:
530+
- name: ubuntu
531+
version: 24.04
532+
disable-containerd-snapshotter: [ true, false ]
526533
runs-on: ubuntu-24.04
527534
env:
528535
JFROG_CLI_LOG_LEVEL: DEBUG
529536
steps:
530537
- name: Checkout jfrog-cli-artifactory
531-
uses: actions/checkout@v4
538+
uses: actions/checkout@v6
532539
with:
533540
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
534541
ref: ${{ github.event.pull_request.head.sha || github.sha }}
535542

536-
- name: Configure Docker 29 for Legacy Support
543+
- name: Configure Docker with legacy snapshotter
544+
if: matrix.disable-containerd-snapshotter == true
537545
run: |
538546
sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
539547
{
540-
"insecure-registries": ["localhost:8082"],
541-
"features": {
542-
"containerd-snapshotter": false
543-
}
548+
"insecure-registries": ["localhost:8082"],
549+
"features": {
550+
"containerd-snapshotter": false
551+
}
552+
}
553+
EOF'
554+
sudo systemctl restart docker
555+
556+
- name: Configure Docker with containerd snapshotter
557+
if: matrix.disable-containerd-snapshotter == false
558+
run: |
559+
sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
560+
{
561+
"insecure-registries": ["localhost:8082"]
544562
}
545563
EOF'
546564
sudo systemctl restart docker

0 commit comments

Comments
 (0)